diff options
| author | Patrice Mandin <[email protected]> | 2007-07-07 00:08:35 +0200 |
|---|---|---|
| committer | Patrice Mandin <[email protected]> | 2007-07-07 00:08:35 +0200 |
| commit | f0aa6654e27b279ecb29e9fd19c140cb1ac7946f (patch) | |
| tree | ea9caba04ed3c5b3005edd79060002cb66a5e03a /src/mesa/main/texenvprogram.c | |
| parent | 69501d76fc6a45da48bf4c416ac9e15edd44e7a9 (diff) | |
| parent | f98bdfca574478837b33c97d131dad4833e3ee12 (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
Diffstat (limited to 'src/mesa/main/texenvprogram.c')
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 0c6fa82f112..72b54b27d9a 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -28,10 +28,10 @@ #include "glheader.h" #include "macros.h" #include "enums.h" -#include "prog_parameter.h" -#include "prog_instruction.h" -#include "prog_print.h" -#include "prog_statevars.h" +#include "shader/prog_parameter.h" +#include "shader/prog_instruction.h" +#include "shader/prog_print.h" +#include "shader/prog_statevars.h" #include "texenvprogram.h" /** @@ -871,7 +871,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit) key->unit[unit].OptRGB); } else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT || - key->unit[unit].ModeA == MODE_DOT3_RGBA) { + key->unit[unit].ModeRGB == MODE_DOT3_RGBA) { out = emit_combine( p, dest, WRITEMASK_XYZW, saturate, unit, |