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

st/mesa: sink and simplify texBaseFormat getting for sampler states

Browse Source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2017-06-10 22:44:10 +02:00
parent 8aba778fa2
commit c845984690
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,10 +107,6 @@ st_convert_sampler(const struct st_context *st,
const struct gl_sampler_object *msamp, const struct gl_sampler_object *msamp,
struct pipe_sampler_state *sampler) struct pipe_sampler_state *sampler)
{ {
GLenum texBaseFormat;
texBaseFormat = _mesa_texture_base_format(texobj);
memset(sampler, 0, sizeof(*sampler)); memset(sampler, 0, sizeof(*sampler));
sampler->wrap_s = gl_wrap_xlate(msamp->WrapS); sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
sampler->wrap_t = gl_wrap_xlate(msamp->WrapT); sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
@@ -149,6 +145,7 @@ st_convert_sampler(const struct st_context *st,
msamp->BorderColor.ui[2] || msamp->BorderColor.ui[2] ||
msamp->BorderColor.ui[3]) { msamp->BorderColor.ui[3]) {
const GLboolean is_integer = texobj->_IsIntegerFormat; const GLboolean is_integer = texobj->_IsIntegerFormat;
GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;
if (st->apply_texture_swizzle_to_border_color) { if (st->apply_texture_swizzle_to_border_color) {
const struct st_texture_object *stobj = st_texture_object_const(texobj); const struct st_texture_object *stobj = st_texture_object_const(texobj);
@@ -195,11 +192,14 @@ st_convert_sampler(const struct st_context *st,
0 : (GLuint) msamp->MaxAnisotropy); 0 : (GLuint) msamp->MaxAnisotropy);
/* If sampling a depth texture and using shadow comparison */ /* If sampling a depth texture and using shadow comparison */
if ((texBaseFormat == GL_DEPTH_COMPONENT || if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
(texBaseFormat == GL_DEPTH_STENCIL && !texobj->StencilSampling)) && GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;
msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE; if (texBaseFormat == GL_DEPTH_COMPONENT ||
sampler->compare_func = st_compare_func_to_pipe(msamp->CompareFunc); (texBaseFormat == GL_DEPTH_STENCIL && !texobj->StencilSampling)) {
sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;
sampler->compare_func = st_compare_func_to_pipe(msamp->CompareFunc);
}
} }
/* Only set the seamless cube map texture parameter because the per-context /* Only set the seamless cube map texture parameter because the per-context