From: Matteo Bruni Subject: [PATCH 1/5] wined3d: Fix immediate draws when ARB_vertex_array_bgra is not supported. Message-Id: <1468967608-28590-1-git-send-email-mbruni@codeweavers.com> Date: Wed, 20 Jul 2016 00:33:24 +0200 Signed-off-by: Matteo Bruni --- It might help with bug 40978. dlls/wined3d/directx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dc41c7e..56fffee 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3099,6 +3099,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttrib4f) /* OpenGL 2.0 */ USE_GL_FUNC(glVertexAttrib4fv) /* OpenGL 2.0 */ USE_GL_FUNC(glVertexAttrib4Nsv) /* OpenGL 2.0 */ + USE_GL_FUNC(glVertexAttrib4Nub) /* OpenGL 2.0 */ USE_GL_FUNC(glVertexAttrib4Nubv) /* OpenGL 2.0 */ USE_GL_FUNC(glVertexAttrib4Nusv) /* OpenGL 2.0 */ USE_GL_FUNC(glVertexAttrib4sv) /* OpenGL 2.0 */ @@ -3214,6 +3215,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glVertexAttrib4f, glVertexAttrib4fARB); MAP_GL_FUNCTION(glVertexAttrib4fv, glVertexAttrib4fvARB); MAP_GL_FUNCTION(glVertexAttrib4Nsv, glVertexAttrib4NsvARB); + MAP_GL_FUNCTION(glVertexAttrib4Nub, glVertexAttrib4NubARB); MAP_GL_FUNCTION(glVertexAttrib4Nubv, glVertexAttrib4NubvARB); MAP_GL_FUNCTION(glVertexAttrib4Nusv, glVertexAttrib4NusvARB); MAP_GL_FUNCTION(glVertexAttrib4sv, glVertexAttrib4svARB); @@ -5848,7 +5850,7 @@ static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter *adapter) ops->generic[WINED3D_FFP_EMIT_FLOAT2] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib2fv; ops->generic[WINED3D_FFP_EMIT_FLOAT3] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib3fv; ops->generic[WINED3D_FFP_EMIT_FLOAT4] = (wined3d_generic_attrib_func)gl_info->gl_ops.ext.p_glVertexAttrib4fv; - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = generic_d3dcolor; else ops->generic[WINED3D_FFP_EMIT_D3DCOLOR] = -- 2.7.3