ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Unclamp vertex colors for 3.0 shaders in ARB if needed.

This commit is contained in:
Stefan Dösinger 2009-06-25 22:09:36 +02:00 committed by Alexandre Julliard
parent f69fb5c011
commit 4d86eac60a
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/wined3d/arb_program_shader.c
View File

@ -166,6 +166,7 @@ struct arb_vs_compiled_shader
GLuint prgId; GLuint prgId;
UINT int_consts[MAX_CONST_I]; UINT int_consts[MAX_CONST_I];
char num_int_consts; char num_int_consts;
char need_color_unclamp;
UINT pos_fixup; UINT pos_fixup;
}; };
@ -240,6 +241,7 @@ struct shader_arb_priv
BOOL use_arbfp_fixed_func; BOOL use_arbfp_fixed_func;
struct wine_rb_tree fragment_shaders; struct wine_rb_tree fragment_shaders;
BOOL last_ps_const_clamped; BOOL last_ps_const_clamped;
BOOL last_vs_color_unclamp;
struct wine_rb_tree signature_tree; struct wine_rb_tree signature_tree;
DWORD ps_sig_number; DWORD ps_sig_number;
@ -3334,7 +3336,8 @@ static DWORD find_input_signature(struct shader_arb_priv *priv, const struct win
return found_sig->idx; return found_sig->idx;
} }
static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx) static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_num, struct shader_arb_ctx_priv *priv_ctx,
struct arb_vs_compiled_shader *compiled)
{ {
unsigned int i, j; unsigned int i, j;
static const char *texcoords[8] = static const char *texcoords[8] =
@ -3454,6 +3457,16 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu
{ {
if(semantic_idx == 0) priv_ctx->fog_output = decl_idx_to_string[reg_idx]; if(semantic_idx == 0) priv_ctx->fog_output = decl_idx_to_string[reg_idx];
} }
else
{
continue;
}
if(strcmp(decl_idx_to_string[reg_idx], "result.color.primary") == 0 ||
strcmp(decl_idx_to_string[reg_idx], "result.color.secondary") == 0)
{
compiled->need_color_unclamp = TRUE;
}
} }
/* Map declared to declared */ /* Map declared to declared */
@ -3491,6 +3504,12 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu
sig[j].semantic_idx == shader->output_signature[i].semantic_idx) sig[j].semantic_idx == shader->output_signature[i].semantic_idx)
{ {
priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx]; priv_ctx->vs_output[i] = decl_idx_to_string[sig[j].register_idx];
if(strcmp(priv_ctx->vs_output[i], "result.color.primary") == 0 ||
strcmp(priv_ctx->vs_output[i], "result.color.secondary") == 0)
{
compiled->need_color_unclamp = TRUE;
}
} }
} }
} }
@ -3514,7 +3533,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This,
memset(&priv_ctx, 0, sizeof(priv_ctx)); memset(&priv_ctx, 0, sizeof(priv_ctx));
priv_ctx.cur_vs_args = args; priv_ctx.cur_vs_args = args;
list_init(&priv_ctx.control_frames); list_init(&priv_ctx.control_frames);
init_output_registers(This, args->ps_signature, &priv_ctx); init_output_registers(This, args->ps_signature, &priv_ctx, compiled);
/* Create the hw ARB shader */ /* Create the hw ARB shader */
shader_addline(buffer, "!!ARBvp1.0\n"); shader_addline(buffer, "!!ARBvp1.0\n");
@ -4070,10 +4089,11 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
if (useVS) { if (useVS) {
struct arb_vs_compile_args compile_args; struct arb_vs_compile_args compile_args;
struct arb_vs_compiled_shader *compiled; struct arb_vs_compiled_shader *compiled;
IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader;
TRACE("Using vertex shader %p\n", This->stateBlock->vertexShader); TRACE("Using vertex shader %p\n", This->stateBlock->vertexShader);
find_arb_vs_compile_args((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, This->stateBlock, &compile_args); find_arb_vs_compile_args(vs, This->stateBlock, &compile_args);
compiled = find_arb_vshader((IWineD3DVertexShaderImpl *) This->stateBlock->vertexShader, &compile_args); compiled = find_arb_vshader(vs, &compile_args);
priv->current_vprogram_id = compiled->prgId; priv->current_vprogram_id = compiled->prgId;
priv->compiled_vprog = compiled; priv->compiled_vprog = compiled;
@ -4086,6 +4106,17 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {
checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);"); checkGLcall("glEnable(GL_VERTEX_PROGRAM_ARB);");
TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id); TRACE("(%p) : Bound vertex program %u and enabled GL_VERTEX_PROGRAM_ARB\n", This, priv->current_vprogram_id);
shader_arb_vs_local_constants(This); shader_arb_vs_local_constants(This);
if(priv->last_vs_color_unclamp != compiled->need_color_unclamp) {
priv->last_vs_color_unclamp = compiled->need_color_unclamp;
if (GL_SUPPORT(ARB_COLOR_BUFFER_FLOAT)) {
GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, !compiled->need_color_unclamp));
checkGLcall("glClampColorARB");
} else {
FIXME("vertex color clamp needs to be changed, but extension not supported.\n");
}
}
} else if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) { } else if(GL_SUPPORT(ARB_VERTEX_PROGRAM)) {
priv->current_vprogram_id = 0; priv->current_vprogram_id = 0;
glDisable(GL_VERTEX_PROGRAM_ARB); glDisable(GL_VERTEX_PROGRAM_ARB);