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

st/mesa: simplify get_texture_format_swizzle

Browse Source 
- Don't check GL_NONE (that was only for buffers).
- Don't use util_format_is_depth_or_stencil.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák
2017-06-12 01:04:34 +02:00
parent f0ecd36ef8
commit 3ee1c9b126
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/state_tracker/st_sampler_view.c
View File

@@ -281,16 +281,17 @@ get_texture_format_swizzle(const struct st_context *st,
const struct st_texture_object *stObj, const struct st_texture_object *stObj,
unsigned glsl_version) unsigned glsl_version)
{ {
GLenum baseFormat = _mesa_texture_base_format(&stObj->base); GLenum baseFormat = _mesa_base_tex_image(&stObj->base)->_BaseFormat;
unsigned tex_swizzle; unsigned tex_swizzle;
if (baseFormat != GL_NONE) {
GLenum depth_mode = stObj->base.DepthMode; GLenum depth_mode = stObj->base.DepthMode;
/* In ES 3.0, DEPTH_TEXTURE_MODE is expected to be GL_RED for textures /* In ES 3.0, DEPTH_TEXTURE_MODE is expected to be GL_RED for textures
* with depth component data specified with a sized internal format. * with depth component data specified with a sized internal format.
*/ */
if (_mesa_is_gles3(st->ctx) && if (_mesa_is_gles3(st->ctx) &&
util_format_is_depth_or_stencil(stObj->pt->format)) { (baseFormat == GL_DEPTH_COMPONENT ||
baseFormat == GL_DEPTH_STENCIL ||
baseFormat == GL_STENCIL_INDEX)) {
const struct gl_texture_image *firstImage = const struct gl_texture_image *firstImage =
_mesa_base_tex_image(&stObj->base); _mesa_base_tex_image(&stObj->base);
if (firstImage->InternalFormat != GL_DEPTH_COMPONENT && if (firstImage->InternalFormat != GL_DEPTH_COMPONENT &&
@@ -302,10 +303,6 @@ get_texture_format_swizzle(const struct st_context *st,
depth_mode, depth_mode,
stObj->pt->format, stObj->pt->format,
glsl_version); glsl_version);
}
else {
tex_swizzle = SWIZZLE_XYZW;
}
/* Combine the texture format swizzle with user's swizzle */ /* Combine the texture format swizzle with user's swizzle */
return swizzle_swizzle(stObj->base._Swizzle, tex_swizzle); return swizzle_swizzle(stObj->base._Swizzle, tex_swizzle);