diff options
author | Kenneth Graunke <[email protected]> | 2015-04-07 15:46:56 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2015-04-10 02:16:31 -0700 |
commit | 709b88ccd8009d98142616cb53c2ad66ddcd52a9 (patch) | |
tree | f6ee1f2040a1c1d491981a0c8933ce30b490baec /src/glsl | |
parent | 99264b7f37dc92bcb3a9ae226e00c9300414431c (diff) |
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 <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/nir/nir_lower_samplers.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
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; } |