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

move t->Image[i]->Format test (bug 659012)

Browse Source
This commit is contained in:
Brian Paul
2003-01-08 16:48:04 +00:00
parent 1e091f48f0
commit ff9ef3baed
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/texobj.c
View File

@@ -1,10 +1,10 @@
/* $Id: texobj.c,v 1.63 2002/12/12 13:03:15 keithw Exp $ */ /* $Id: texobj.c,v 1.64 2003/01/08 16:48:04 brianp Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 4.1 * Version: 5.1
* *
* Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -454,12 +454,6 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
height /= 2; height /= 2;
} }
if (i >= minLevel && i <= maxLevel) { if (i >= minLevel && i <= maxLevel) {
/* Don't support GL_DEPTH_COMPONENT for cube maps */
if (t->Image[i]->Format == GL_DEPTH_COMPONENT) {
t->Complete = GL_FALSE;
incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
return;
}
/* check that we have images defined */ /* check that we have images defined */
if (!t->Image[i] || !t->NegX[i] || if (!t->Image[i] || !t->NegX[i] ||
!t->PosY[i] || !t->NegY[i] || !t->PosY[i] || !t->NegY[i] ||
@@ -468,6 +462,12 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
incomplete(t, "CubeMap Image[i] == NULL"); incomplete(t, "CubeMap Image[i] == NULL");
return; return;
} }
/* Don't support GL_DEPTH_COMPONENT for cube maps */
if (t->Image[i]->Format == GL_DEPTH_COMPONENT) {
t->Complete = GL_FALSE;
incomplete(t, "GL_DEPTH_COMPONENT only works with 1/2D tex");
return;
}
/* check that all six images have same size */ /* check that all six images have same size */
if (t->NegX[i]->Width2!=width || t->NegX[i]->Height2!=height || if (t->NegX[i]->Width2!=width || t->NegX[i]->Height2!=height ||
t->PosY[i]->Width2!=width || t->PosY[i]->Height2!=height || t->PosY[i]->Width2!=width || t->PosY[i]->Height2!=height ||