diff options
| author | Brian Paul <brianp@vmware.com> | 2016-02-11 08:14:27 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2016-02-12 15:11:38 -0700 |
| commit | 6e09df24b5cd7da0f49622db15ca70f5b2a3594b (patch) | |
| tree | 0b1cb48ccf77d1aa2cbf36cfc0d3b16e5a5f96eb /src/mesa/main/textureview.c | |
| parent | 82db969ac014531dcaba4e4637d6c691f5825e4b (diff) | |
| download | external_mesa3d-6e09df24b5cd7da0f49622db15ca70f5b2a3594b.zip external_mesa3d-6e09df24b5cd7da0f49622db15ca70f5b2a3594b.tar.gz external_mesa3d-6e09df24b5cd7da0f49622db15ca70f5b2a3594b.tar.bz2 | |
mesa: simplify some code with new _mesa_cube_face_target() function
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Diffstat (limited to 'src/mesa/main/textureview.c')
| -rw-r--r-- | src/mesa/main/textureview.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 04b7d73..316d828 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -211,10 +211,7 @@ initialize_texture_fields(struct gl_context *ctx, for (level = 0; level < levels; level++) { for (face = 0; face < numFaces; face++) { struct gl_texture_image *texImage; - GLenum faceTarget = target; - - if (target == GL_TEXTURE_CUBE_MAP) - faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + face; + const GLenum faceTarget = _mesa_cube_face_target(target, face); texImage = _mesa_get_tex_image(ctx, texObj, faceTarget, level); @@ -536,9 +533,7 @@ _mesa_TextureView(GLuint texture, GLenum target, GLuint origtexture, newViewNumLevels = MIN2(numlevels, origTexObj->NumLevels - minlevel); newViewNumLayers = MIN2(numlayers, origTexObj->NumLayers - minlayer); - faceTarget = origTexObj->Target; - if (faceTarget == GL_TEXTURE_CUBE_MAP) - faceTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X + minlayer; + faceTarget = _mesa_cube_face_target(origTexObj->Target, minlayer); /* Get a reference to what will become this View's base level */ origTexImage = _mesa_select_tex_image(origTexObj, faceTarget, minlevel); |