fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-26 22:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

GL_EXT_packed_depth_stencil changes

Browse source
This commit is contained in:
Brian Paul 2005-10-01 16:06:25 +00:00
parent 0899afae33
commit b0a0ca8bd9
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/swrast/s_texcombine.c
View file

@ -748,7 +748,7 @@ texture_apply( const GLcontext *ctx,
if (format == GL_COLOR_INDEX || format == GL_YCBCR_MESA) {
format = GL_RGBA; /* a bit of a hack */
}
else if (format == GL_DEPTH_COMPONENT) {
else if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
format = texUnit->_Current->DepthMode;
}

8
src/mesa/swrast/s_texfilter.c
View file

@ -2248,7 +2248,9 @@ sample_depth_texture( GLcontext *ctx,
(void) lambda;
ASSERT(tObj->Image[0][tObj->BaseLevel]->Format == GL_DEPTH_COMPONENT);
ASSERT(tObj->Image[0][tObj->BaseLevel]->Format == GL_DEPTH_COMPONENT ||
tObj->Image[0][tObj->BaseLevel]->Format == GL_DEPTH_STENCIL_EXT);
ASSERT(tObj->Target == GL_TEXTURE_1D ||
tObj->Target == GL_TEXTURE_2D ||
tObj->Target == GL_TEXTURE_RECTANGLE_NV);
@ -2649,7 +2651,7 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
switch (t->Target) {
case GL_TEXTURE_1D:
if (format == GL_DEPTH_COMPONENT) {
if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
return &sample_depth_texture;
}
else if (needLambda) {
@ -2663,7 +2665,7 @@ _swrast_choose_texture_sample_func( GLcontext *ctx,
return &sample_nearest_1d;
}
case GL_TEXTURE_2D:
if (format == GL_DEPTH_COMPONENT) {
if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
return &sample_depth_texture;
}
else if (needLambda) {