mesa/formats: add more MESA_FORMAT_LAYOUTs

[mesa.git] / src / mesa / program / sampler.cpp

diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp
index 3b459d59cf8af160898fe085bca8f38e6005dac5..ea3024d512ae6d0a979950e4a6b93b7fa5ee1c6f 100644 (file)
--- a/src/mesa/program/sampler.cpp
+++ b/src/mesa/program/sampler.cpp
@@ -27,12 +27,13 @@
 #include "glsl_types.h"
 #include "ir_visitor.h"
 #include "../glsl/program.h"
+#include "ir_uniform.h"
 
-extern "C" {
-#include "main/compiler.h"
 #include "main/mtypes.h"
+#include "program/hash_table.h"
 #include "program/prog_parameter.h"
-}
+#include "program/program.h"
+
 
 class get_sampler_name : public ir_hierarchical_visitor
 {
@@ -100,7 +101,7 @@ public:
    ir_dereference *last;
 };
 
-extern "C" {
+
 int
 _mesa_get_sampler_uniform_value(class ir_dereference *sampler,
                                struct gl_shader_program *shader_program,
@@ -108,19 +109,37 @@ _mesa_get_sampler_uniform_value(class ir_dereference *sampler,
 {
    get_sampler_name getname(sampler, shader_program);
 
-   sampler->accept(&getname);
+   GLuint shader = _mesa_program_enum_to_shader_stage(prog->Target);
 
-   GLint index = _mesa_lookup_parameter_index(prog->Parameters, -1,
-                                             getname.name);
+   sampler->accept(&getname);
 
-   if (index < 0) {
+   unsigned location;
+   if (!shader_program->UniformHash->get(location, getname.name)) {
       linker_error(shader_program,
                   "failed to find sampler named %s.\n", getname.name);
       return 0;
    }
 
-   index += getname.offset;
+   if (!shader_program->UniformStorage[location].sampler[shader].active) {
+      assert(0 && "cannot return a sampler");
+      linker_error(shader_program,
+                  "cannot return a sampler named %s, because it is not "
+                   "used in this shader stage. This is a driver bug.\n",
+                   getname.name);
+      return 0;
+   }
 
-   return prog->Parameters->ParameterValues[index][0].f;
+   return shader_program->UniformStorage[location].sampler[shader].index +
+          getname.offset;
 }
+
+
+class ir_rvalue *
+_mesa_get_sampler_array_nonconst_index(class ir_dereference *sampler)
+{
+   ir_dereference_array *deref_arr = sampler->as_dereference_array();
+   if (!deref_arr || deref_arr->array_index->as_constant())
+      return NULL;
+
+   return deref_arr->array_index;
 }