projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: Add _mesa_set_sampler_srgb_decode method
[mesa.git]
/
src
/
mesa
/
program
/
sampler.cpp
diff --git
a/src/mesa/program/sampler.cpp
b/src/mesa/program/sampler.cpp
index ea3024d512ae6d0a979950e4a6b93b7fa5ee1c6f..84e2504baba170824e52988065b794effd24e2de 100644
(file)
--- a/
src/mesa/program/sampler.cpp
+++ b/
src/mesa/program/sampler.cpp
@@
-23,13
+23,12
@@
* DEALINGS IN THE SOFTWARE.
*/
* DEALINGS IN THE SOFTWARE.
*/
-#include "ir.h"
-#include "glsl_types.h"
-#include "ir_visitor.h"
-#include "../glsl/program.h"
-#include "ir_uniform.h"
-
#include "main/mtypes.h"
#include "main/mtypes.h"
+#include "glsl/nir/glsl_types.h"
+#include "glsl/ir.h"
+#include "glsl/ir_uniform.h"
+#include "glsl/ir_visitor.h"
+#include "glsl/program.h"
#include "program/hash_table.h"
#include "program/prog_parameter.h"
#include "program/program.h"
#include "program/hash_table.h"
#include "program/prog_parameter.h"
#include "program/program.h"
@@
-120,7
+119,7
@@
_mesa_get_sampler_uniform_value(class ir_dereference *sampler,
return 0;
}
return 0;
}
- if (!shader_program->UniformStorage[location].
sampler
[shader].active) {
+ if (!shader_program->UniformStorage[location].
opaque
[shader].active) {
assert(0 && "cannot return a sampler");
linker_error(shader_program,
"cannot return a sampler named %s, because it is not "
assert(0 && "cannot return a sampler");
linker_error(shader_program,
"cannot return a sampler named %s, because it is not "
@@
-129,7
+128,7
@@
_mesa_get_sampler_uniform_value(class ir_dereference *sampler,
return 0;
}
return 0;
}
- return shader_program->UniformStorage[location].
sampler
[shader].index +
+ return shader_program->UniformStorage[location].
opaque
[shader].index +
getname.offset;
}
getname.offset;
}