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

st/mesa: merge fragment/vertex texture update code

Browse Source 
Reviewed-by: José Fonseca <jfonseca@vmware.com>
This commit is contained in:
Brian Paul
2012-08-06 08:35:20 -06:00
parent dd6aafcf72
commit 2aac0d145a
1 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/mesa/state_tracker/st_atom_texture.c
View File

@@ -254,51 +254,66 @@ update_single_texture(struct st_context *st,
} }
static void static void
update_vertex_textures(struct st_context *st) update_textures(struct st_context *st,
unsigned shader_stage,
const struct gl_program *prog,
unsigned max_units,
struct pipe_sampler_view **sampler_views,
unsigned *num_textures)
{ {
const struct gl_context *ctx = st->ctx; const GLuint old_max = *num_textures;
struct gl_vertex_program *vprog = ctx->VertexProgram._Current; GLbitfield samplers_used = prog->SamplersUsed;
GLuint su; GLuint unit;
const GLuint old_max = st->state.num_vertex_textures;
GLbitfield samplers_used = vprog->Base.SamplersUsed;
if (samplers_used == 0x0 && old_max == 0) if (samplers_used == 0x0 && old_max == 0)
return; return;
st->state.num_vertex_textures = 0; *num_textures = 0;
/* loop over sampler units (aka tex image units) */ /* loop over sampler units (aka tex image units) */
for (su = 0; su < ctx->Const.MaxVertexTextureImageUnits; su++, samplers_used >>= 1) { for (unit = 0; unit < max_units; unit++, samplers_used >>= 1) {
struct pipe_sampler_view *sampler_view = NULL; struct pipe_sampler_view *sampler_view = NULL;
if (samplers_used & 1) { if (samplers_used & 1) {
const GLuint texUnit = prog->SamplerUnits[unit];
GLboolean retval; GLboolean retval;
GLuint texUnit;
texUnit = vprog->Base.SamplerUnits[su];
retval = update_single_texture(st, &sampler_view, texUnit); retval = update_single_texture(st, &sampler_view, texUnit);
if (retval == GL_FALSE) if (retval == GL_FALSE)
continue; continue;
st->state.num_vertex_textures = su + 1; *num_textures = unit + 1;
} else if (samplers_used == 0 && su >= old_max) { }
else if (samplers_used == 0 && unit >= old_max) {
/* if we've reset all the old views and we have no more new ones */ /* if we've reset all the old views and we have no more new ones */
break; break;
} }
pipe_sampler_view_reference(&st->state.vertex_sampler_views[su], pipe_sampler_view_reference(&(sampler_views[unit]), sampler_view);
sampler_view);
} }
if (ctx->Const.MaxVertexTextureImageUnits > 0) {
GLuint numUnits = MIN2(st->state.num_vertex_textures,
ctx->Const.MaxVertexTextureImageUnits);
cso_set_sampler_views(st->cso_context, cso_set_sampler_views(st->cso_context,
shader_stage,
MIN2(*num_textures, max_units),
sampler_views);
}
static void
update_vertex_textures(struct st_context *st)
{
const struct gl_context *ctx = st->ctx;
if (ctx->Const.MaxVertexTextureImageUnits > 0) {
update_textures(st,
PIPE_SHADER_VERTEX, PIPE_SHADER_VERTEX,
numUnits, &ctx->VertexProgram._Current->Base,
st->state.vertex_sampler_views); ctx->Const.MaxVertexTextureImageUnits,
st->state.vertex_sampler_views,
&st->state.num_vertex_textures);
} }
} }
@@ -307,44 +322,13 @@ static void
update_fragment_textures(struct st_context *st) update_fragment_textures(struct st_context *st)
{ {
const struct gl_context *ctx = st->ctx; const struct gl_context *ctx = st->ctx;
struct gl_fragment_program *fprog = ctx->FragmentProgram._Current;
GLuint su;
const GLuint old_max = st->state.num_fragment_textures;
GLbitfield samplers_used = fprog->Base.SamplersUsed;
if (samplers_used == 0x0 && old_max == 0) update_textures(st,
return;
st->state.num_fragment_textures = 0;
/* loop over sampler units (aka tex image units) */
for (su = 0; su < ctx->Const.MaxTextureImageUnits; su++, samplers_used >>= 1) {
struct pipe_sampler_view *sampler_view = NULL;
if (samplers_used & 1) {
GLboolean retval;
GLuint texUnit;
texUnit = fprog->Base.SamplerUnits[su];
retval = update_single_texture(st, &sampler_view, texUnit);
if (retval == GL_FALSE)
continue;
st->state.num_fragment_textures = su + 1;
} else if (samplers_used == 0 && su >= old_max) {
/* if we've reset all the old views and we have no more new ones */
break;
}
pipe_sampler_view_reference(&st->state.fragment_sampler_views[su],
sampler_view);
}
cso_set_sampler_views(st->cso_context,
PIPE_SHADER_FRAGMENT, PIPE_SHADER_FRAGMENT,
st->state.num_fragment_textures, &ctx->FragmentProgram._Current->Base,
st->state.fragment_sampler_views); ctx->Const.MaxTextureImageUnits,
st->state.fragment_sampler_views,
&st->state.num_fragment_textures);
} }