i965/vs: Fix NULL pointer dereference in pre-Gen6 push constant loading.

[mesa.git] / src / mesa / drivers / dri / r300 / radeon_mesa_to_rc.c

diff --git a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
index 9f9dec840b41cb18e2caa5843fb8f5035ac4012a..b1dfccd22d0b1b5720d01eb1d71bff2c366e34e9 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
+++ b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
@@ -28,8 +28,8 @@
 #include "radeon_mesa_to_rc.h"
 
 #include "main/mtypes.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_instruction.h"
+#include "program/prog_parameter.h"
 
 #include "compiler/radeon_compiler.h"
 #include "compiler/radeon_program.h"
@@ -128,7 +128,6 @@ static void translate_dstreg(struct rc_dst_register * dest, struct prog_dst_regi
 {
        dest->File = translate_register_file(src->File);
        dest->Index = src->Index;
-       dest->RelAddr = src->RelAddr;
        dest->WriteMask = src->WriteMask;
 }
 
@@ -171,6 +170,7 @@ static void translate_instruction(struct radeon_compiler * c,
                dest->U.I.TexSrcUnit = src->TexSrcUnit;
                dest->U.I.TexSrcTarget = translate_tex_target(src->TexSrcTarget);
                dest->U.I.TexShadow = src->TexShadow;
+               dest->U.I.TexSwizzle = RC_SWIZZLE_XYZW;
        }
 }