wined3d: Drop redundant check for instanced rendering from drawStridedFast.

We need GL_ARB_instanced_arrays to be able to take the fastest path and that's already checked in draw_primitive. Note that GL_ARB_instanced_arrays provides glDrawElementsInstanced if GL_ARB_draw_instanced is not supported so we don't need to explicitly check for the latter.

wined3d: Drop redundant check for instanced rendering from drawStridedFast.
db80aba5 · Matteo Bruni · Alexandre Julliard · 8ed9c2a1 · db80aba5
Commit db80aba5 authored Feb 27, 2015 by Matteo Bruni Committed by Alexandre Julliard Mar 02, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 16 deletions

drawprim.c dlls/wined3d/drawprim.c +9 -16

No files found.
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -44,26 +44,19 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit
        GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT;
        if (instance_count)
        {
-            if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS])
+            if (start_instance)
+                FIXME("Start instance (%u) not supported.\n", start_instance);
+            if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])
            {
-                FIXME("Instanced drawing not supported.\n");
+                GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype,
+                        (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index));
+                checkGLcall("glDrawElementsInstancedBaseVertex");
            }
            else
            {
-                if (start_instance)
-                    FIXME("Start instance (%u) not supported.\n", start_instance);
-                if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])
-                {
-                    GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype,
-                            (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index));
-                    checkGLcall("glDrawElementsInstancedBaseVertex");
-                }
-                else
-                {
-                    GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype,
-                            (const char *)idx_data + (idx_size * start_idx), instance_count));
-                    checkGLcall("glDrawElementsInstanced");
-                }
+                GL_EXTCALL(glDrawElementsInstanced(primitive_type, count, idxtype,
+                        (const char *)idx_data + (idx_size * start_idx), instance_count));
+                checkGLcall("glDrawElementsInstanced");
            }
        }
        else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])