Skip to content

W
wine-cw
Commit 0df3db37 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Explicitly pass device and state to gen_ffp_frag_op().

parent 3ccf12a7
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
dlls/wined3d/arb_program_shader.c
View file @ 0df3db37
...@@ -6257,9 +6257,11 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state ...@@ -6257,9 +6257,11 @@ static void fragment_prog_arbfp(DWORD state_id, struct wined3d_stateblock *state
return; return;
} }
if(!use_pshader) { if (!use_pshader)
/* Find or create a shader implementing the fixed function pipeline settings, then activate it */ {
gen_ffp_frag_op(stateblock, &settings, FALSE); /* Find or create a shader implementing the fixed function pipeline
* settings, then activate it. */
gen_ffp_frag_op(device, state, &settings, FALSE);
desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings);
if(!desc) { if(!desc) {
struct arbfp_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); struct arbfp_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc));
......
dlls/wined3d/ati_fragment_shader.c
View file @ 0df3db37
...@@ -806,7 +806,7 @@ static void set_tex_op_atifs(DWORD state, struct wined3d_stateblock *stateblock, ...@@ -806,7 +806,7 @@ static void set_tex_op_atifs(DWORD state, struct wined3d_stateblock *stateblock,
DWORD mapped_stage; DWORD mapped_stage;
unsigned int i; unsigned int i;
gen_ffp_frag_op(stateblock, &settings, TRUE); gen_ffp_frag_op(device, &stateblock->state, &settings, TRUE);
desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); desc = (const struct atifs_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings);
if(!desc) { if(!desc) {
struct atifs_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc)); struct atifs_ffp_desc *new_desc = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_desc));
......
dlls/wined3d/utils.c
View file @ 0df3db37
...@@ -2749,7 +2749,8 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { ...@@ -2749,7 +2749,8 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) {
return size; return size;
} }
void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_settings *settings, BOOL ignore_textype) void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_state *state,
struct ffp_frag_settings *settings, BOOL ignore_textype)
{ {
#define ARG1 0x01 #define ARG1 0x01
#define ARG2 0x02 #define ARG2 0x02
...@@ -2786,8 +2787,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2786,8 +2787,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
unsigned int i; unsigned int i;
DWORD ttff; DWORD ttff;
DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2; DWORD cop, aop, carg0, carg1, carg2, aarg0, aarg1, aarg2;
struct wined3d_device *device = stateblock->device; const struct wined3d_surface *rt = device->fb.render_targets[0];
struct wined3d_surface *rt = device->fb.render_targets[0];
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
for (i = 0; i < gl_info->limits.texture_stages; ++i) for (i = 0; i < gl_info->limits.texture_stages; ++i)
...@@ -2795,7 +2795,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2795,7 +2795,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
const struct wined3d_texture *texture; const struct wined3d_texture *texture;
settings->op[i].padding = 0; settings->op[i].padding = 0;
if (stateblock->state.texture_states[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) if (state->texture_states[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE)
{ {
settings->op[i].cop = WINED3DTOP_DISABLE; settings->op[i].cop = WINED3DTOP_DISABLE;
settings->op[i].aop = WINED3DTOP_DISABLE; settings->op[i].aop = WINED3DTOP_DISABLE;
...@@ -2809,7 +2809,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2809,7 +2809,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
break; break;
} }
if ((texture = stateblock->state.textures[i])) if ((texture = state->textures[i]))
{ {
settings->op[i].color_fixup = texture->resource.format->color_fixup; settings->op[i].color_fixup = texture->resource.format->color_fixup;
if (ignore_textype) if (ignore_textype)
...@@ -2842,14 +2842,14 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2842,14 +2842,14 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
settings->op[i].tex_type = tex_1d; settings->op[i].tex_type = tex_1d;
} }
cop = stateblock->state.texture_states[i][WINED3DTSS_COLOROP]; cop = state->texture_states[i][WINED3DTSS_COLOROP];
aop = stateblock->state.texture_states[i][WINED3DTSS_ALPHAOP]; aop = state->texture_states[i][WINED3DTSS_ALPHAOP];
carg1 = (args[cop] & ARG1) ? stateblock->state.texture_states[i][WINED3DTSS_COLORARG1] : ARG_UNUSED; carg1 = (args[cop] & ARG1) ? state->texture_states[i][WINED3DTSS_COLORARG1] : ARG_UNUSED;
carg2 = (args[cop] & ARG2) ? stateblock->state.texture_states[i][WINED3DTSS_COLORARG2] : ARG_UNUSED; carg2 = (args[cop] & ARG2) ? state->texture_states[i][WINED3DTSS_COLORARG2] : ARG_UNUSED;
carg0 = (args[cop] & ARG0) ? stateblock->state.texture_states[i][WINED3DTSS_COLORARG0] : ARG_UNUSED; carg0 = (args[cop] & ARG0) ? state->texture_states[i][WINED3DTSS_COLORARG0] : ARG_UNUSED;
if (is_invalid_op(&stateblock->state, i, cop, carg1, carg2, carg0)) if (is_invalid_op(state, i, cop, carg1, carg2, carg0))
{ {
carg0 = ARG_UNUSED; carg0 = ARG_UNUSED;
carg2 = ARG_UNUSED; carg2 = ARG_UNUSED;
...@@ -2868,16 +2868,16 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2868,16 +2868,16 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
} }
else else
{ {
aarg1 = (args[aop] & ARG1) ? stateblock->state.texture_states[i][WINED3DTSS_ALPHAARG1] : ARG_UNUSED; aarg1 = (args[aop] & ARG1) ? state->texture_states[i][WINED3DTSS_ALPHAARG1] : ARG_UNUSED;
aarg2 = (args[aop] & ARG2) ? stateblock->state.texture_states[i][WINED3DTSS_ALPHAARG2] : ARG_UNUSED; aarg2 = (args[aop] & ARG2) ? state->texture_states[i][WINED3DTSS_ALPHAARG2] : ARG_UNUSED;
aarg0 = (args[aop] & ARG0) ? stateblock->state.texture_states[i][WINED3DTSS_ALPHAARG0] : ARG_UNUSED; aarg0 = (args[aop] & ARG0) ? state->texture_states[i][WINED3DTSS_ALPHAARG0] : ARG_UNUSED;
} }
if (!i && stateblock->state.textures[0] && stateblock->state.render_states[WINED3DRS_COLORKEYENABLE]) if (!i && state->textures[0] && state->render_states[WINED3DRS_COLORKEYENABLE])
{ {
GLenum texture_dimensions; GLenum texture_dimensions;
texture = stateblock->state.textures[0]; texture = state->textures[0];
texture_dimensions = texture->target; texture_dimensions = texture->target;
if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB) if (texture_dimensions == GL_TEXTURE_2D || texture_dimensions == GL_TEXTURE_RECTANGLE_ARB)
...@@ -2893,7 +2893,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2893,7 +2893,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
} }
else if (aop == WINED3DTOP_SELECTARG1 && aarg1 != WINED3DTA_TEXTURE) else if (aop == WINED3DTOP_SELECTARG1 && aarg1 != WINED3DTA_TEXTURE)
{ {
if (stateblock->state.render_states[WINED3DRS_ALPHABLENDENABLE]) if (state->render_states[WINED3DRS_ALPHABLENDENABLE])
{ {
aarg2 = WINED3DTA_TEXTURE; aarg2 = WINED3DTA_TEXTURE;
aop = WINED3DTOP_MODULATE; aop = WINED3DTOP_MODULATE;
...@@ -2902,7 +2902,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2902,7 +2902,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
} }
else if (aop == WINED3DTOP_SELECTARG2 && aarg2 != WINED3DTA_TEXTURE) else if (aop == WINED3DTOP_SELECTARG2 && aarg2 != WINED3DTA_TEXTURE)
{ {
if (stateblock->state.render_states[WINED3DRS_ALPHABLENDENABLE]) if (state->render_states[WINED3DRS_ALPHABLENDENABLE])
{ {
aarg1 = WINED3DTA_TEXTURE; aarg1 = WINED3DTA_TEXTURE;
aop = WINED3DTOP_MODULATE; aop = WINED3DTOP_MODULATE;
...@@ -2913,7 +2913,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2913,7 +2913,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
} }
} }
if (is_invalid_op(&stateblock->state, i, aop, aarg1, aarg2, aarg0)) if (is_invalid_op(state, i, aop, aarg1, aarg2, aarg0))
{ {
aarg0 = ARG_UNUSED; aarg0 = ARG_UNUSED;
aarg2 = ARG_UNUSED; aarg2 = ARG_UNUSED;
...@@ -2924,7 +2924,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2924,7 +2924,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
if (carg1 == WINED3DTA_TEXTURE || carg2 == WINED3DTA_TEXTURE || carg0 == WINED3DTA_TEXTURE if (carg1 == WINED3DTA_TEXTURE || carg2 == WINED3DTA_TEXTURE || carg0 == WINED3DTA_TEXTURE
|| aarg1 == WINED3DTA_TEXTURE || aarg2 == WINED3DTA_TEXTURE || aarg0 == WINED3DTA_TEXTURE) || aarg1 == WINED3DTA_TEXTURE || aarg2 == WINED3DTA_TEXTURE || aarg0 == WINED3DTA_TEXTURE)
{ {
ttff = stateblock->state.texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; ttff = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS];
if (ttff == (WINED3DTTFF_PROJECTED | WINED3DTTFF_COUNT3)) if (ttff == (WINED3DTTFF_PROJECTED | WINED3DTTFF_COUNT3))
{ {
settings->op[i].projected = proj_count3; settings->op[i].projected = proj_count3;
...@@ -2946,12 +2946,10 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2946,12 +2946,10 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
settings->op[i].aarg1 = aarg1; settings->op[i].aarg1 = aarg1;
settings->op[i].aarg2 = aarg2; settings->op[i].aarg2 = aarg2;
if (stateblock->state.texture_states[i][WINED3DTSS_RESULTARG] == WINED3DTA_TEMP) if (state->texture_states[i][WINED3DTSS_RESULTARG] == WINED3DTA_TEMP)
{
settings->op[i].dst = tempreg; settings->op[i].dst = tempreg;
} else { else
settings->op[i].dst = resultreg; settings->op[i].dst = resultreg;
}
} }
/* Clear unsupported stages */ /* Clear unsupported stages */
...@@ -2959,19 +2957,19 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2959,19 +2957,19 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
memset(&settings->op[i], 0xff, sizeof(settings->op[i])); memset(&settings->op[i], 0xff, sizeof(settings->op[i]));
} }
if (!stateblock->state.render_states[WINED3DRS_FOGENABLE]) if (!state->render_states[WINED3DRS_FOGENABLE])
{ {
settings->fog = FOG_OFF; settings->fog = FOG_OFF;
} }
else if (stateblock->state.render_states[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE) else if (state->render_states[WINED3DRS_FOGTABLEMODE] == WINED3DFOG_NONE)
{ {
if (use_vs(&stateblock->state) || stateblock->state.vertex_declaration->position_transformed) if (use_vs(state) || state->vertex_declaration->position_transformed)
{ {
settings->fog = FOG_LINEAR; settings->fog = FOG_LINEAR;
} }
else else
{ {
switch (stateblock->state.render_states[WINED3DRS_FOGVERTEXMODE]) switch (state->render_states[WINED3DRS_FOGVERTEXMODE])
{ {
case WINED3DFOG_NONE: case WINED3DFOG_NONE:
case WINED3DFOG_LINEAR: case WINED3DFOG_LINEAR:
...@@ -2988,7 +2986,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -2988,7 +2986,7 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
} }
else else
{ {
switch (stateblock->state.render_states[WINED3DRS_FOGTABLEMODE]) switch (state->render_states[WINED3DRS_FOGTABLEMODE])
{ {
case WINED3DFOG_LINEAR: case WINED3DFOG_LINEAR:
settings->fog = FOG_LINEAR; settings->fog = FOG_LINEAR;
...@@ -3001,15 +2999,15 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett ...@@ -3001,15 +2999,15 @@ void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_sett
break; break;
} }
} }
if (stateblock->state.render_states[WINED3DRS_SRGBWRITEENABLE] if (state->render_states[WINED3DRS_SRGBWRITEENABLE]
&& rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE) && rt->resource.format->flags & WINED3DFMT_FLAG_SRGB_WRITE)
{ {
settings->sRGB_write = 1; settings->sRGB_write = 1;
} else { } else {
settings->sRGB_write = 0; settings->sRGB_write = 0;
} }
if (device->vs_clipping || !use_vs(&stateblock->state) || !stateblock->state.render_states[WINED3DRS_CLIPPING] if (device->vs_clipping || !use_vs(state) || !state->render_states[WINED3DRS_CLIPPING]
|| !stateblock->state.render_states[WINED3DRS_CLIPPLANEENABLE]) || !state->render_states[WINED3DRS_CLIPPLANEENABLE])
{ {
/* No need to emulate clipplanes if GL supports native vertex shader clipping or if /* No need to emulate clipplanes if GL supports native vertex shader clipping or if
* the fixed function vertex pipeline is used(which always supports clipplanes), or * the fixed function vertex pipeline is used(which always supports clipplanes), or
......
dlls/wined3d/wined3d_private.h
View file @ 0df3db37
...@@ -1591,8 +1591,8 @@ struct ffp_frag_desc ...@@ -1591,8 +1591,8 @@ struct ffp_frag_desc
extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECLSPEC_HIDDEN; extern const struct wine_rb_functions wined3d_ffp_frag_program_rb_functions DECLSPEC_HIDDEN;
extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN; extern const struct wined3d_parent_ops wined3d_null_parent_ops DECLSPEC_HIDDEN;
void gen_ffp_frag_op(struct wined3d_stateblock *stateblock, struct ffp_frag_settings *settings, void gen_ffp_frag_op(const struct wined3d_device *device, const struct wined3d_state *state,
BOOL ignore_textype) DECLSPEC_HIDDEN; struct ffp_frag_settings *settings, BOOL ignore_textype) DECLSPEC_HIDDEN;
const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders, const struct ffp_frag_desc *find_ffp_frag_shader(const struct wine_rb_tree *fragment_shaders,
const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN; const struct ffp_frag_settings *settings) DECLSPEC_HIDDEN;
void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN; void add_ffp_frag_shader(struct wine_rb_tree *shaders, struct ffp_frag_desc *desc) DECLSPEC_HIDDEN;
......
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