i965/vec4: Make with_writemask() non-static.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_cubemap_normalize.cpp

diff --git a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
index 35bea681214d63f35ad3f631137e9ec2eb0a713e..9e149f96f5382178db42024bde876821e0bb0ccc 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cubemap_normalize.cpp
@@ -30,8 +30,8 @@
  * \author Eric Anholt <eric@anholt.net>
  */
 
-#include "../glsl/glsl_types.h"
-#include "../glsl/ir.h"
+#include "glsl/glsl_types.h"
+#include "glsl/ir.h"
 
 class brw_cubemap_normalize_visitor : public ir_hierarchical_visitor {
 public:
@@ -51,7 +51,10 @@ brw_cubemap_normalize_visitor::visit_leave(ir_texture *ir)
    if (ir->sampler->type->sampler_dimensionality != GLSL_SAMPLER_DIM_CUBE)
       return visit_continue;
 
-   void *mem_ctx = talloc_parent(ir);
+   if (ir->op == ir_txs)
+      return visit_continue;
+
+   void *mem_ctx = ralloc_parent(ir);
 
    ir_variable *var = new(mem_ctx) ir_variable(ir->coordinate->type,
                                               "coordinate", ir_var_auto);
@@ -97,7 +100,7 @@ brw_cubemap_normalize_visitor::visit_leave(ir_texture *ir)
 
 extern "C" {
 
-GLboolean
+bool
 brw_do_cubemap_normalize(exec_list *instructions)
 {
    brw_cubemap_normalize_visitor v;