OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fragment program fog problems found with Glean.

Browse Source 
1. add PROGRAM_CONSTANT to switch() in src_vector().
2. use _mesa_append_fog_code() to handle fog options in i915ProgramStringNotify().
3. Re-enable some vertex attribute emit code that was previously disabled in i915ValidateFragmentProgram().
This commit is contained in:
Brian Paul
2006-11-02 21:43:06 +00:00
parent 67a101759e
commit d78f65cd6c
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/dri/i915/i915_fragprog.c
View File

@@ -39,6 +39,7 @@
#include "program_instruction.h" #include "program_instruction.h"
#include "program.h" #include "program.h"
#include "programopt.h"
@@ -123,6 +124,7 @@ static GLuint src_vector( struct i915_fragment_program *p,
p, p->ctx->FragmentProgram.Parameters[source->Index]); p, p->ctx->FragmentProgram.Parameters[source->Index]);
break; break;
case PROGRAM_CONSTANT:
case PROGRAM_STATE_VAR: case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM: case PROGRAM_NAMED_PARAM:
src = i915_emit_param4fv( src = i915_emit_param4fv(
@@ -937,6 +939,12 @@ static void i915ProgramStringNotify( GLcontext *ctx,
*/ */
ctx->Driver.Enable( ctx, GL_FRAGMENT_PROGRAM_ARB, ctx->Driver.Enable( ctx, GL_FRAGMENT_PROGRAM_ARB,
ctx->FragmentProgram.Enabled ); ctx->FragmentProgram.Enabled );
if (p->FragProg.FogOption) {
/* add extra instructions to do fog, then turn off FogOption field */
_mesa_append_fog_code(ctx, &p->FragProg);
p->FragProg.FogOption = GL_NONE;
}
} }
_tnl_program_string(ctx, target, prog); _tnl_program_string(ctx, target, prog);
@@ -1010,7 +1018,10 @@ void i915ValidateFragmentProgram( i915ContextPtr i915 )
EMIT_PAD( 1 ); EMIT_PAD( 1 );
} }
#if 0 /* XXX this was disabled, but enabling this code helped fix the Glean
* tfragprog1 fog tests.
*/
#if 1
if ((inputsRead & FRAG_BIT_FOGC) || i915->vertex_fog != I915_FOG_NONE) { if ((inputsRead & FRAG_BIT_FOGC) || i915->vertex_fog != I915_FOG_NONE) {
EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1F, S4_VFMT_FOG_PARAM, 4 ); EMIT_ATTR( _TNL_ATTRIB_FOG, EMIT_1F, S4_VFMT_FOG_PARAM, 4 );
} }

13
src/mesa/drivers/dri/i915tex/i915_fragprog.c
View File

@@ -39,6 +39,7 @@
#include "program_instruction.h" #include "program_instruction.h"
#include "program.h" #include "program.h"
#include "programopt.h"
@@ -127,6 +128,7 @@ src_vector(struct i915_fragment_program *p,
Index]); Index]);
break; break;
case PROGRAM_CONSTANT:
case PROGRAM_STATE_VAR: case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM: case PROGRAM_NAMED_PARAM:
src = src =
@@ -928,6 +930,12 @@ i915ProgramStringNotify(GLcontext * ctx,
*/ */
ctx->Driver.Enable(ctx, GL_FRAGMENT_PROGRAM_ARB, ctx->Driver.Enable(ctx, GL_FRAGMENT_PROGRAM_ARB,
ctx->FragmentProgram.Enabled); ctx->FragmentProgram.Enabled);
if (p->FragProg.FogOption) {
/* add extra instructions to do fog, then turn off FogOption field */
_mesa_append_fog_code(ctx, &p->FragProg);
p->FragProg.FogOption = GL_NONE;
}
} }
_tnl_program_string(ctx, target, prog); _tnl_program_string(ctx, target, prog);
@@ -1001,7 +1009,10 @@ i915ValidateFragmentProgram(struct i915_context *i915)
EMIT_PAD(1); EMIT_PAD(1);
} }
#if 0 /* XXX this was disabled, but enabling this code helped fix the Glean
* tfragprog1 fog tests.
*/
#if 1
if ((inputsRead & FRAG_BIT_FOGC) || i915->vertex_fog != I915_FOG_NONE) { if ((inputsRead & FRAG_BIT_FOGC) || i915->vertex_fog != I915_FOG_NONE) {
EMIT_ATTR(_TNL_ATTRIB_FOG, EMIT_1F, S4_VFMT_FOG_PARAM, 4); EMIT_ATTR(_TNL_ATTRIB_FOG, EMIT_1F, S4_VFMT_FOG_PARAM, 4);
} }