diff options
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_fragprog.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c index e421d218d7..e391043f4d 100644 --- a/src/mesa/swrast/s_fragprog.c +++ b/src/mesa/swrast/s_fragprog.c @@ -169,7 +169,7 @@ init_machine(struct gl_context *ctx, struct gl_program_machine *machine, machine->Samplers = program->Base.SamplerUnits; /* if running a GLSL program (not ARB_fragment_program) */ - if (ctx->Shader.CurrentProgram) { + if (ctx->Shader.CurrentFragmentProgram) { /* Store front/back facing value */ machine->Attribs[FRAG_ATTRIB_FACE][col][0] = 1.0F - span->facing; } diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 6ddacab1cb..5e6356c0d5 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -514,7 +514,7 @@ _swrast_ReadPixels( struct gl_context *ctx, type, pixels, &clippedPacking); break; default: - _mesa_problem(ctx, "unexpected format in _swrast_ReadPixels"); + _mesa_problem(ctx, "unexpected format 0x%x in _swrast_ReadPixels", format); /* don't return yet, clean-up */ } |