Commit 4272d92f authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Avoid the position_float4() fixup if the vertex pipe can handle…

wined3d: Avoid the position_float4() fixup if the vertex pipe can handle pre-transformed vertices itself.
parent b62b740d
...@@ -4682,12 +4682,18 @@ static void WINE_GLAPI warn_no_specular_func(const void *data) ...@@ -4682,12 +4682,18 @@ static void WINE_GLAPI warn_no_specular_func(const void *data)
WARN("GL_EXT_secondary_color not supported\n"); WARN("GL_EXT_secondary_color not supported\n");
} }
static void fillGLAttribFuncs(const struct wined3d_gl_info *gl_info) static void wined3d_adapter_init_ffp_attrib_ops(const struct wined3d_adapter *adapter)
{ {
const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info;
const struct wined3d_gl_info *gl_info = &adapter->gl_info;
position_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT1] = invalid_func;
position_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_FLOAT2] = invalid_func;
position_funcs[WINED3D_FFP_EMIT_FLOAT3] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex3fv; position_funcs[WINED3D_FFP_EMIT_FLOAT3] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex3fv;
if (!d3d_info->xyzrhw)
position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4; position_funcs[WINED3D_FFP_EMIT_FLOAT4] = position_float4;
else
position_funcs[WINED3D_FFP_EMIT_FLOAT4] = (glAttribFunc)gl_info->gl_ops.gl.p_glVertex4fv;
position_funcs[WINED3D_FFP_EMIT_D3DCOLOR] = position_d3dcolor; position_funcs[WINED3D_FFP_EMIT_D3DCOLOR] = position_d3dcolor;
position_funcs[WINED3D_FFP_EMIT_UBYTE4] = invalid_func; position_funcs[WINED3D_FFP_EMIT_UBYTE4] = invalid_func;
position_funcs[WINED3D_FFP_EMIT_SHORT2] = invalid_func; position_funcs[WINED3D_FFP_EMIT_SHORT2] = invalid_func;
...@@ -5031,7 +5037,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal) ...@@ -5031,7 +5037,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal)
WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx);
fillGLAttribFuncs(&adapter->gl_info); wined3d_adapter_init_ffp_attrib_ops(adapter);
return TRUE; return TRUE;
} }
......
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