From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 7 Apr 2015 22:46:56 +0000 (-0700)
Subject: nir: Remove linker_error calls from nir_lower_samplers().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=709b88ccd8009d98142616cb53c2ad66ddcd52a9;p=mesa.git

nir: Remove linker_error calls from nir_lower_samplers().

These should never happen.  Plus, NIR passes really shouldn't be
reporting linker errors - this is past link time.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/nir/nir_lower_samplers.cpp b/src/glsl/nir/nir_lower_samplers.cpp
index 7a7cf852db5..90e023aab3d 100644
--- a/src/glsl/nir/nir_lower_samplers.cpp
+++ b/src/glsl/nir/nir_lower_samplers.cpp
@@ -41,17 +41,12 @@ get_sampler_index(struct gl_shader_program *shader_program,
 {
    unsigned location;
    if (!shader_program->UniformHash->get(location, name)) {
-      linker_error(shader_program,
-                   "failed to find sampler named %s.\n", name);
+      assert(!"failed to find sampler");
       return 0;
    }
 
    if (!shader_program->UniformStorage[location].sampler[stage].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",
-                   name);
+      assert(!"cannot return a sampler");
       return 0;
    }