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

st/mesa: don't set the border color if it's unused

Browse Source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2017-06-15 13:45:24 +02:00
parent 743ad599a9
commit b007744051
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,11 +139,25 @@ st_convert_sampler(const struct st_context *st,
assert(sampler->min_lod <= sampler->max_lod); assert(sampler->min_lod <= sampler->max_lod);
} }
/* Check that only wrap modes using the border color have the first bit
* set.
*/
STATIC_ASSERT(PIPE_TEX_WRAP_CLAMP & 0x1);
STATIC_ASSERT(PIPE_TEX_WRAP_CLAMP_TO_BORDER & 0x1);
STATIC_ASSERT(PIPE_TEX_WRAP_MIRROR_CLAMP & 0x1);
STATIC_ASSERT(PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER & 0x1);
STATIC_ASSERT(((PIPE_TEX_WRAP_REPEAT |
PIPE_TEX_WRAP_CLAMP_TO_EDGE |
PIPE_TEX_WRAP_MIRROR_REPEAT |
PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE) & 0x1) == 0);
/* For non-black borders... */ /* For non-black borders... */
if (msamp->BorderColor.ui[0] || if (/* This is true if wrap modes are using the border color: */
msamp->BorderColor.ui[1] || (sampler->wrap_s | sampler->wrap_t | sampler->wrap_r) & 0x1 &&
msamp->BorderColor.ui[2] || (msamp->BorderColor.ui[0] ||
msamp->BorderColor.ui[3]) { msamp->BorderColor.ui[1] ||
msamp->BorderColor.ui[2] ||
msamp->BorderColor.ui[3])) {
const GLboolean is_integer = texobj->_IsIntegerFormat; const GLboolean is_integer = texobj->_IsIntegerFormat;
GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat; GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;