summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-03-29 04:48:21 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-03-29 04:48:21 +0000
commit2742c4e4db63d61f585c014103eaeadffa8e0833 (patch)
tree16efc73d5a38f8af38c87a11c579eacc8470eb41 /src/mesa
parent2b430ef56a5a1730843f3f056dfaa9ef9a0901bd (diff)
new tests for GL_DEPTH_STENCIL_EXT
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/texstore.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index f5d23db6504..64a74761472 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2283,7 +2283,8 @@ FetchTexelFloatToChan( const struct gl_texture_image *texImage,
GLfloat temp[4];
ASSERT(texImage->FetchTexelf);
texImage->FetchTexelf(texImage, i, j, k, temp);
- if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT) {
+ if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT ||
+ texImage->TexFormat->BaseFormat == GL_DEPTH_STENCIL_EXT) {
/* just one channel */
UNCLAMPED_FLOAT_TO_CHAN(texelOut[0], temp[0]);
}
@@ -2307,7 +2308,8 @@ FetchTexelChanToFloat( const struct gl_texture_image *texImage,
GLchan temp[4];
ASSERT(texImage->FetchTexelc);
texImage->FetchTexelc(texImage, i, j, k, temp);
- if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT) {
+ if (texImage->TexFormat->BaseFormat == GL_DEPTH_COMPONENT ||
+ texImage->TexFormat->BaseFormat == GL_DEPTH_STENCIL_EXT) {
/* just one channel */
texelOut[0] = CHAN_TO_FLOAT(temp[0]);
}