case MESA_FORMAT_RGBA_DXT5:
return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT4_5);
default:
- fprintf(stderr, "%s: bad image format %x\n", __FUNCTION__, mesa_format);
+ fprintf(stderr, "%s: bad image format %s\n", __FUNCTION__,
+ _mesa_get_format_name(mesa_format));
abort();
return 0;
}
* efficient, but this has gotten complex enough that we need
* something which is understandable and reliable.
*/
-static GLboolean
+static bool
i830_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3)
{
struct gl_context *ctx = &intel->ctx;
GLubyte border[4];
GLuint dst_x, dst_y;
- memset(state, 0, sizeof(state));
+ memset(state, 0, sizeof(*state));
/*We need to refcount these. */
}
if (!intel_finalize_mipmap_tree(intel, unit))
- return GL_FALSE;
+ return false;
/* Get first image here, since intelObj->firstLevel will get set in
* the intel_finalize_mipmap_tree() call above.
*/
firstImage = tObj->Image[0][tObj->BaseLevel];
- intel_miptree_get_image_offset(intelObj->mt, tObj->BaseLevel, 0, 0,
+ intel_miptree_get_image_offset(intelObj->mt, tObj->BaseLevel, 0,
&dst_x, &dst_y);
- drm_intel_bo_reference(intelObj->mt->region->buffer);
- i830->state.tex_buffer[unit] = intelObj->mt->region->buffer;
- pitch = intelObj->mt->region->pitch * intelObj->mt->cpp;
+ drm_intel_bo_reference(intelObj->mt->region->bo);
+ i830->state.tex_buffer[unit] = intelObj->mt->region->bo;
+ pitch = intelObj->mt->region->pitch;
/* XXX: This calculation is probably broken for tiled images with
* a non-page-aligned offset.
mipFilt = MIPFILTER_LINEAR;
break;
default:
- return GL_FALSE;
+ return false;
}
if (sampler->MaxAnisotropy > 1.0) {
magFilt = FILTER_LINEAR;
break;
default:
- return GL_FALSE;
+ return false;
}
}
/* 3D textures not available on i830
*/
if (tObj->Target == GL_TEXTURE_3D)
- return GL_FALSE;
+ return false;
state[I830_TEXREG_MCS] = (_3DSTATE_MAP_COORD_SET_CMD |
MAP_UNIT(unit) |
border[1],
border[2]);
- I830_ACTIVESTATE(i830, I830_UPLOAD_TEX(unit), GL_TRUE);
+ I830_ACTIVESTATE(i830, I830_UPLOAD_TEX(unit), true);
/* memcmp was already disabled, but definitely won't work as the
* region might now change and that wouldn't be detected:
*/
I830_STATECHANGE(i830, I830_UPLOAD_TEX(unit));
- return GL_TRUE;
+ return true;
}
i830UpdateTextureState(struct intel_context *intel)
{
struct i830_context *i830 = i830_context(&intel->ctx);
- GLboolean ok = GL_TRUE;
+ bool ok = true;
GLuint i;
for (i = 0; i < I830_TEX_UNITS && ok; i++) {
case 0:{
struct i830_context *i830 = i830_context(&intel->ctx);
if (i830->state.active & I830_UPLOAD_TEX(i))
- I830_ACTIVESTATE(i830, I830_UPLOAD_TEX(i), GL_FALSE);
+ I830_ACTIVESTATE(i830, I830_UPLOAD_TEX(i), false);
if (i830->state.tex_buffer[i] != NULL) {
drm_intel_bo_unreference(i830->state.tex_buffer[i]);
}
case TEXTURE_3D_BIT:
default:
- ok = GL_FALSE;
+ ok = false;
break;
}
}