diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-06 17:53:44 +0200 |
| commit | 3b8bc1f46758d4da9155419fcf558a493e729501 (patch) | |
| tree | 0dbfb4ae1ed6b49caaed3e662b27db30fe2e8801 /src/mesa/main/texenvprogram.c | |
| parent | ffe58739da9eee2e99682747cc8f26e412c87430 (diff) | |
| parent | ffa2659204121f703208782ff225a22e0c21b173 (diff) | |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
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 0c6fa82f11..72b54b27d9 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, |