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

Fix compile errors when DEBUG is defined.

Browse Source
This commit is contained in:
Ian Romanick
2004-10-18 00:00:41 +00:00
parent 48da4a4a86
commit b430a1ae22
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/drivers/dri/r200/r200_texstate.c
View File

@@ -279,7 +279,7 @@ static void r200SetTexImages( r200ContextPtr rmesa,
t->pp_txformat_x |= R200_TEXCOORD_VOLUME; t->pp_txformat_x |= R200_TEXCOORD_VOLUME;
} }
else if (tObj->Target == GL_TEXTURE_CUBE_MAP) { else if (tObj->Target == GL_TEXTURE_CUBE_MAP) {
ASSERT(log2Width == log2height); ASSERT(log2Width == log2Height);
t->pp_txformat |= ((log2Width << R200_TXFORMAT_F5_WIDTH_SHIFT) | t->pp_txformat |= ((log2Width << R200_TXFORMAT_F5_WIDTH_SHIFT) |
(log2Height << R200_TXFORMAT_F5_HEIGHT_SHIFT) | (log2Height << R200_TXFORMAT_F5_HEIGHT_SHIFT) |
(R200_TXFORMAT_CUBIC_MAP_ENABLE)); (R200_TXFORMAT_CUBIC_MAP_ENABLE));
@@ -828,7 +828,7 @@ static void import_tex_obj_state( r200ContextPtr rmesa,
if (texobj->base.tObj->Target == GL_TEXTURE_CUBE_MAP) { if (texobj->base.tObj->Target == GL_TEXTURE_CUBE_MAP) {
GLuint *cube_cmd = R200_DB_STATE( cube[unit] ); GLuint *cube_cmd = R200_DB_STATE( cube[unit] );
GLuint bytesPerFace = texobj->base.totalSize / 6; GLuint bytesPerFace = texobj->base.totalSize / 6;
ASSERT(texobj->totalSize % 6 == 0); ASSERT(texobj->base.totalSize % 6 == 0);
cube_cmd[CUBE_PP_CUBIC_FACES] = texobj->pp_cubic_faces; cube_cmd[CUBE_PP_CUBIC_FACES] = texobj->pp_cubic_faces;
cube_cmd[CUBE_PP_CUBIC_OFFSET_F1] = texobj->pp_txoffset + 1 * bytesPerFace; cube_cmd[CUBE_PP_CUBIC_OFFSET_F1] = texobj->pp_txoffset + 1 * bytesPerFace;
cube_cmd[CUBE_PP_CUBIC_OFFSET_F2] = texobj->pp_txoffset + 2 * bytesPerFace; cube_cmd[CUBE_PP_CUBIC_OFFSET_F2] = texobj->pp_txoffset + 2 * bytesPerFace;

6
src/mesa/drivers/dri/tdfx/tdfx_tex.c
View File

@@ -212,7 +212,7 @@ tdfxTexGetInfo(const GLcontext *ctx, int w, int h,
/* Hardware only allows a maximum aspect ratio of 8x1, so handle /* Hardware only allows a maximum aspect ratio of 8x1, so handle
|ar| > 3 by scaling the image and using an 8x1 aspect ratio */ |ar| > 3 by scaling the image and using an 8x1 aspect ratio */
if (ar >= 0) { if (ar >= 0) {
ASSERT(width >= height); ASSERT(w >= h);
lod = logw; lod = logw;
if (ar <= GR_ASPECT_LOG2_8x1) { if (ar <= GR_ASPECT_LOG2_8x1) {
t = 256 >> ar; t = 256 >> ar;
@@ -225,7 +225,7 @@ tdfxTexGetInfo(const GLcontext *ctx, int w, int h,
} }
} }
else { else {
ASSERT(width < height); ASSERT(w < h);
lod = logh; lod = logh;
if (ar >= GR_ASPECT_LOG2_1x8) { if (ar >= GR_ASPECT_LOG2_1x8) {
s = 256 >> -ar; s = 256 >> -ar;
@@ -595,7 +595,7 @@ convertPalette(FxU32 data[256], const struct gl_color_table *table)
FxU32 r, g, b, a; FxU32 r, g, b, a;
GLint i; GLint i;
ASSERT(table->TableType == GL_UNSIGNED_BYTE); ASSERT(table->Type == GL_UNSIGNED_BYTE);
switch (table->Format) { switch (table->Format) {
case GL_INTENSITY: case GL_INTENSITY: