Changeset 69139 in webkit
- Timestamp:
- Oct 5, 2010 1:17:19 PM (14 years ago)
- Location:
- trunk/WebKit/chromium
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r69123 r69139 1 2010-10-05 Alok Priyadarshi <alokp@chromium.org> 2 3 Reviewed by Kenneth Russell. 4 5 Supported ANGLE SH_VERSION > 100 6 https://bugs.webkit.org/show_bug.cgi?id=47024 7 8 * src/WebGraphicsContext3DDefaultImpl.cpp: 9 (WebKit::WebGraphicsContext3DDefaultImpl::angleCreateCompilers): 10 (WebKit::WebGraphicsContext3DDefaultImpl::angleValidateShaderSource): 11 1 12 2010-10-04 Jeremy Orlow <jorlow@chromium.org> 2 13 -
trunk/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
r68806 r69139 1415 1415 return false; 1416 1416 1417 TBuiltInResource resource; 1418 resource.MaxVertexAttribs = 0; 1419 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resource.MaxVertexAttribs); 1420 resource.MaxVertexUniformVectors = 0; 1421 getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, 1422 &resource.MaxVertexUniformVectors); 1423 resource.MaxVaryingVectors = 0; 1424 getIntegerv(MAX_VARYING_VECTORS, 1425 &resource.MaxVaryingVectors); 1426 resource.MaxVertexTextureImageUnits = 0; 1427 getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &resource.MaxVertexTextureImageUnits); 1428 resource.MaxCombinedTextureImageUnits = 0; 1429 getIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &resource.MaxCombinedTextureImageUnits); 1430 resource.MaxTextureImageUnits = 0; 1431 getIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &resource.MaxTextureImageUnits); 1432 resource.MaxFragmentUniformVectors = 0; 1433 getIntegerv(MAX_FRAGMENT_UNIFORM_VECTORS, 1434 &resource.MaxFragmentUniformVectors); 1417 #if defined(SH_VERSION) && (SH_VERSION > 100) 1418 ShBuiltInResources resources; 1419 ShInitBuiltInResources(&resources); 1420 #else 1421 TBuiltInResource resources; 1422 ShInitBuiltInResource(&resources); 1423 #endif // SH_VERSION 1424 getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs); 1425 getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors); 1426 getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors); 1427 getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &resources.MaxVertexTextureImageUnits); 1428 getIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &resources.MaxCombinedTextureImageUnits); 1429 getIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &resources.MaxTextureImageUnits); 1430 getIntegerv(MAX_FRAGMENT_UNIFORM_VECTORS, &resources.MaxFragmentUniformVectors); 1435 1431 // Always set to 1 for OpenGL ES. 1436 resource.MaxDrawBuffers = 1; 1437 1438 m_fragmentCompiler = ShConstructCompiler(EShLangFragment, EShSpecWebGL, &resource); 1439 m_vertexCompiler = ShConstructCompiler(EShLangVertex, EShSpecWebGL, &resource); 1432 resources.MaxDrawBuffers = 1; 1433 1434 #if defined(SH_VERSION) && (SH_VERSION > 100) 1435 m_fragmentCompiler = ShConstructCompiler(SH_FRAGMENT_SHADER, SH_WEBGL_SPEC, &resources); 1436 m_vertexCompiler = ShConstructCompiler(SH_VERTEX_SHADER, SH_WEBGL_SPEC, &resources); 1437 #else 1438 m_fragmentCompiler = ShConstructCompiler(EShLangFragment, EShSpecWebGL, &resources); 1439 m_vertexCompiler = ShConstructCompiler(EShLangVertex, EShSpecWebGL, &resources); 1440 #endif // SH_VERSION 1440 1441 return (m_fragmentCompiler && m_vertexCompiler); 1441 1442 } … … 1477 1478 return false; 1478 1479 1480 #if defined(SH_VERSION) && (SH_VERSION > 100) 1481 if (!ShCompile(compiler, &entry.source, 1, SH_OBJECT_CODE)) { 1482 #else 1479 1483 if (!ShCompile(compiler, &entry.source, 1, EShOptObjectCode)) { 1484 #endif // SH_VERSION 1480 1485 int logSize = 0; 1481 1486 ShGetInfo(compiler, SH_INFO_LOG_LENGTH, &logSize);
Note: See TracChangeset
for help on using the changeset viewer.