diff options
| author | Timothy Arceri <[email protected]> | 2016-11-04 11:40:10 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-01-06 11:21:42 +1100 |
| commit | 4807a83da0e0f5e3272e85504ee3b2213ef1910a (patch) | |
| tree | 049b5850dad445b764189b9ba122b6fb51876d63 /src/mesa | |
| parent | c46a630000a2539e38a448f24a456397ce201a2e (diff) | |
mesa/glsl: set num_textures per stage directly in shader_info
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/uniform_query.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index ffd21ecea3b..69241beadd1 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2356,7 +2356,6 @@ struct gl_linked_shader * \note Each of these fields is only set post-linking. */ /*@{*/ - unsigned num_samplers; /**< Number of samplers used by this shader. */ GLbitfield active_samplers; /**< Bitfield of which samplers are used */ GLbitfield shadow_samplers; /**< Samplers used for shadow sampling. */ /*@}*/ diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp index ec6d2774844..73e7b0bfdfd 100644 --- a/src/mesa/main/uniform_query.cpp +++ b/src/mesa/main/uniform_query.cpp @@ -1141,7 +1141,7 @@ _mesa_sampler_uniforms_pipeline_are_valid(struct gl_pipeline_object *pipeline) TexturesUsed[unit] |= (1 << tgt); } - active_samplers += shader->num_samplers; + active_samplers += shader->Program->info.num_textures; } if (active_samplers > MAX_COMBINED_TEXTURE_IMAGE_UNITS) { diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index b4ccc5f0525..12a53ecb73d 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -6636,7 +6636,7 @@ set_affected_state_flags(uint64_t *states, if (prog->Parameters->NumParameters) *states |= new_constants; - if (shader->num_samplers) + if (prog->info.num_textures) *states |= new_sampler_views | new_samplers; if (shader->NumImages) |