OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: don't set sampler states for TBOs

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2017-06-15 03:00:59 +02:00
parent 222a910a9b
commit 8aba778fa2
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mesa/state_tracker/st_atom_sampler.c
View File

@@ -223,6 +223,7 @@ st_convert_sampler_from_unit(const struct st_context *st,
texobj = ctx->Texture.Unit[texUnit]._Current;
assert(texobj);
assert(texobj->Target != GL_TEXTURE_BUFFER);
msamp = _mesa_get_samplerobj(ctx, texUnit);
@@ -244,6 +245,7 @@ update_shader_samplers(struct st_context *st,
struct pipe_sampler_state *samplers,
unsigned *out_num_samplers)
{
struct gl_context *ctx = st->ctx;
GLbitfield samplers_used = prog->SamplersUsed;
GLbitfield free_slots = ~prog->SamplersUsed;
GLbitfield external_samplers_used = prog->ExternalSamplersUsed;
@@ -258,9 +260,14 @@ update_shader_samplers(struct st_context *st,
/* loop over sampler units (aka tex image units) */
for (unit = 0; samplers_used; unit++, samplers_used >>= 1) {
struct pipe_sampler_state *sampler = samplers + unit;
unsigned tex_unit = prog->SamplerUnits[unit];
if (samplers_used & 1) {
st_convert_sampler_from_unit(st, sampler, prog->SamplerUnits[unit]);
/* Don't update the sampler for TBOs. cso_context will not bind sampler
* states that are NULL.
*/
if (samplers_used & 1 &&
ctx->Texture.Unit[tex_unit]._Current->Target != GL_TEXTURE_BUFFER) {
st_convert_sampler_from_unit(st, sampler, tex_unit);
states[unit] = sampler;
} else {
states[unit] = NULL;