Expose the ANGLE_instanced_arrays extension.

TRAC #19489 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@975 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent d644931c
...@@ -3720,6 +3720,11 @@ void Context::initExtensionString() ...@@ -3720,6 +3720,11 @@ void Context::initExtensionString()
mExtensionString += "GL_ANGLE_framebuffer_multisample "; mExtensionString += "GL_ANGLE_framebuffer_multisample ";
} }
if (supportsShaderModel3())
{
mExtensionString += "GL_ANGLE_instanced_arrays ";
}
mExtensionString += "GL_ANGLE_pack_reverse_row_order "; mExtensionString += "GL_ANGLE_pack_reverse_row_order ";
if (supportsDXT3Textures()) if (supportsDXT3Textures())
......
...@@ -3329,7 +3329,6 @@ void __stdcall glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params) ...@@ -3329,7 +3329,6 @@ void __stdcall glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
if (context) if (context)
{ {
gl::Query *queryObject = context->getQuery(id, false, GL_NONE); gl::Query *queryObject = context->getQuery(id, false, GL_NONE);
if (!queryObject) if (!queryObject)
...@@ -6497,6 +6496,9 @@ __eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char * ...@@ -6497,6 +6496,9 @@ __eglMustCastToProperFunctionPointerType __stdcall glGetProcAddress(const char *
{"glEndQueryEXT", (__eglMustCastToProperFunctionPointerType)glEndQueryEXT}, {"glEndQueryEXT", (__eglMustCastToProperFunctionPointerType)glEndQueryEXT},
{"glGetQueryivEXT", (__eglMustCastToProperFunctionPointerType)glGetQueryivEXT}, {"glGetQueryivEXT", (__eglMustCastToProperFunctionPointerType)glGetQueryivEXT},
{"glGetQueryObjectuivEXT", (__eglMustCastToProperFunctionPointerType)glGetQueryObjectuivEXT}, {"glGetQueryObjectuivEXT", (__eglMustCastToProperFunctionPointerType)glGetQueryObjectuivEXT},
{"glVertexAttribDivisorANGLE", (__eglMustCastToProperFunctionPointerType)glVertexAttribDivisorANGLE},
{"glDrawArraysInstancedANGLE", (__eglMustCastToProperFunctionPointerType)glDrawArraysInstancedANGLE},
{"glDrawElementsInstancedANGLE", (__eglMustCastToProperFunctionPointerType)glDrawElementsInstancedANGLE},
}; };
for (int ext = 0; ext < sizeof(glExtensions) / sizeof(Extension); ext++) for (int ext = 0; ext < sizeof(glExtensions) / sizeof(Extension); ext++)
......
...@@ -167,6 +167,9 @@ EXPORTS ...@@ -167,6 +167,9 @@ EXPORTS
glEndQueryEXT @169 glEndQueryEXT @169
glGetQueryivEXT @170 glGetQueryivEXT @170
glGetQueryObjectuivEXT @171 glGetQueryObjectuivEXT @171
glVertexAttribDivisorANGLE @172
glDrawArraysInstancedANGLE @173
glDrawElementsInstancedANGLE @174
; EGL dependencies ; EGL dependencies
glCreateContext @144 NONAME glCreateContext @144 NONAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment