wined3d: Use the core version of glDrawElementsInstanced.
This commit is contained in:
parent
75b96768e5
commit
aff0c389cc
|
@ -2884,6 +2884,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
|
||||||
USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */
|
USE_GL_FUNC(glCompressedTexSubImage3D) /* OpenGL 1.3 */
|
||||||
USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */
|
USE_GL_FUNC(glDeleteBuffers) /* OpenGL 1.5 */
|
||||||
USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */
|
USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */
|
||||||
|
USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */
|
||||||
USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */
|
USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */
|
||||||
USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */
|
USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */
|
||||||
USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */
|
USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */
|
||||||
|
@ -2919,6 +2920,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info)
|
||||||
MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB);
|
MAP_GL_FUNCTION(glCompressedTexSubImage3D, glCompressedTexSubImage3DARB);
|
||||||
MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB);
|
MAP_GL_FUNCTION(glDeleteBuffers, glDeleteBuffersARB);
|
||||||
MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB);
|
MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB);
|
||||||
|
MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB);
|
||||||
MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB);
|
MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB);
|
||||||
MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB);
|
MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB);
|
||||||
MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB);
|
MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB);
|
||||||
|
|
|
@ -60,9 +60,9 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype,
|
GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype,
|
||||||
(const char *)idx_data + (idx_size * start_idx), instance_count));
|
(const char *)idx_data + (idx_size * start_idx), instance_count));
|
||||||
checkGLcall("glDrawElementsInstancedARB");
|
checkGLcall("glDrawElementsInstanced");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue