fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: Remove linker_error calls from nir_lower_samplers().

Browse source 
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>
This commit is contained in:
Kenneth Graunke 2015-04-07 15:46:56 -07:00
parent 99264b7f37
commit 709b88ccd8
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/nir/nir_lower_samplers.cpp
View file

@ -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;
}