diff options
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r-- | src/mesa/swrast/s_copypix.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_drawpix.c | 4 | ||||
-rw-r--r-- | src/mesa/swrast/s_fragprog.c | 2 | ||||
-rw-r--r-- | src/mesa/swrast/s_readpix.c | 5 | ||||
-rw-r--r-- | src/mesa/swrast/s_texcombine.c | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c index 86fe3e0a89..46d6379282 100644 --- a/src/mesa/swrast/s_copypix.c +++ b/src/mesa/swrast/s_copypix.c @@ -27,8 +27,8 @@ #include "main/context.h" #include "main/colormac.h" #include "main/condrender.h" -#include "main/image.h" #include "main/macros.h" +#include "main/pixeltransfer.h" #include "main/imports.h" #include "s_context.h" diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c index 8fbb0a8d10..4e9b5307cc 100644 --- a/src/mesa/swrast/s_drawpix.c +++ b/src/mesa/swrast/s_drawpix.c @@ -28,8 +28,10 @@ #include "main/condrender.h" #include "main/context.h" #include "main/image.h" -#include "main/macros.h" #include "main/imports.h" +#include "main/macros.h" +#include "main/pack.h" +#include "main/pixeltransfer.h" #include "main/state.h" #include "s_context.h" 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 55fa60749e..5e6356c0d5 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -29,8 +29,9 @@ #include "main/feedback.h" #include "main/formats.h" #include "main/image.h" -#include "main/macros.h" #include "main/imports.h" +#include "main/macros.h" +#include "main/pack.h" #include "main/state.h" #include "s_context.h" @@ -513,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 */ } diff --git a/src/mesa/swrast/s_texcombine.c b/src/mesa/swrast/s_texcombine.c index 1775810eff..1836d074ae 100644 --- a/src/mesa/swrast/s_texcombine.c +++ b/src/mesa/swrast/s_texcombine.c @@ -27,8 +27,8 @@ #include "main/glheader.h" #include "main/context.h" #include "main/colormac.h" -#include "main/image.h" #include "main/imports.h" +#include "main/pixeltransfer.h" #include "program/prog_instruction.h" #include "s_context.h" |