From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 29 Mar 2006 04:48:21 +0000 (+0000)
Subject: new tests for GL_DEPTH_STENCIL_EXT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2742c4e4db63d61f585c014103eaeadffa8e0833;p=mesa.git

new tests for GL_DEPTH_STENCIL_EXT
---

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]);
    }