← Back to branch summary

~ubuntu-branches/ubuntu/wily/wine1.6/wily

« back to all changes in this revision

Viewing changes to dlls/wined3d/drawprim.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-03-17 17:43:36 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140317174336-9we01jr5mzhomw16
Tags: 1:1.6.2-0ubuntu1
* New upstream release
  - Color management support updated to liblcms version 2.
  - Various bug fixes.
* Drop upstreamed patches for liblcms and freetype support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dlls/wined3d/drawprim.c
44
44
        GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT;
45
45
        if (instance_count)
46
46
        {
47
 
            if (!gl_info->supported[ARB_DRAW_INSTANCED])
 
47
            if (!gl_info->supported[ARB_DRAW_INSTANCED] && !gl_info->supported[ARB_INSTANCED_ARRAYS])
48
48
            {
49
49
                FIXME("Instanced drawing not supported.\n");
50
50
            }
52
52
            {
53
53
                if (start_instance)
54
54
                    FIXME("Start instance (%u) not supported.\n", start_instance);
55
 
                GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype,
56
 
                        (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index));
57
 
                checkGLcall("glDrawElementsInstancedBaseVertex");
 
55
                if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])
 
56
                {
 
57
                    GL_EXTCALL(glDrawElementsInstancedBaseVertex(primitive_type, count, idxtype,
 
58
                            (const char *)idx_data + (idx_size * start_idx), instance_count, base_vertex_index));
 
59
                    checkGLcall("glDrawElementsInstancedBaseVertex");
 
60
                }
 
61
                else
 
62
                {
 
63
                    GL_EXTCALL(glDrawElementsInstancedARB(primitive_type, count, idxtype,
 
64
                            (const char *)idx_data + (idx_size * start_idx), instance_count));
 
65
                    checkGLcall("glDrawElementsInstancedARB");
 
66
                }
58
67
            }
59
68
        }
60
69
        else if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX])