intel: Remove unused stored values reported by clang.

This commit is contained in:
Eric Anholt
2009-12-22 10:58:47 -08:00
parent 1a80fe461e
commit 5727147f89
5 changed files with 3 additions and 18 deletions

View File

@@ -52,7 +52,6 @@ intelCopyBuffer(const __DRIdrawablePrivate * dPriv,
{ {
struct intel_context *intel; struct intel_context *intel;
const intelScreenPrivate *intelScreen;
DBG("%s\n", __FUNCTION__); DBG("%s\n", __FUNCTION__);
@@ -62,8 +61,6 @@ intelCopyBuffer(const __DRIdrawablePrivate * dPriv,
if (!intel) if (!intel)
return; return;
intelScreen = intel->intelScreen;
/* The LOCK_HARDWARE is required for the cliprects. Buffer offsets /* The LOCK_HARDWARE is required for the cliprects. Buffer offsets
* should work regardless. * should work regardless.
*/ */

View File

@@ -398,8 +398,6 @@ static GLboolean
intel_update_wrapper(GLcontext *ctx, struct intel_renderbuffer *irb, intel_update_wrapper(GLcontext *ctx, struct intel_renderbuffer *irb,
struct gl_texture_image *texImage) struct gl_texture_image *texImage)
{ {
gl_format texFormat;
if (texImage->TexFormat == MESA_FORMAT_ARGB8888) { if (texImage->TexFormat == MESA_FORMAT_ARGB8888) {
irb->Base.DataType = GL_UNSIGNED_BYTE; irb->Base.DataType = GL_UNSIGNED_BYTE;
DBG("Render to RGBA8 texture OK\n"); DBG("Render to RGBA8 texture OK\n");
@@ -435,8 +433,6 @@ intel_update_wrapper(GLcontext *ctx, struct intel_renderbuffer *irb,
irb->Base.Format = texImage->TexFormat; irb->Base.Format = texImage->TexFormat;
texFormat = texImage->TexFormat;
irb->Base.InternalFormat = texImage->InternalFormat; irb->Base.InternalFormat = texImage->InternalFormat;
irb->Base._BaseFormat = _mesa_base_fbo_format(ctx, irb->Base.InternalFormat); irb->Base._BaseFormat = _mesa_base_fbo_format(ctx, irb->Base.InternalFormat);
irb->Base.Width = texImage->Width; irb->Base.Width = texImage->Width;

View File

@@ -69,7 +69,6 @@ intel_stencil_drawpixels(GLcontext * ctx,
GLfloat vertices[4][2]; GLfloat vertices[4][2];
struct intel_renderbuffer *irb; struct intel_renderbuffer *irb;
struct intel_renderbuffer *depth_irb; struct intel_renderbuffer *depth_irb;
struct gl_renderbuffer *rb;
struct gl_pixelstore_attrib old_unpack; struct gl_pixelstore_attrib old_unpack;
GLstencil *stencil_pixels; GLstencil *stencil_pixels;
int row, y1, y2; int row, y1, y2;
@@ -170,7 +169,6 @@ intel_stencil_drawpixels(GLcontext * ctx,
*/ */
depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH); depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH);
irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888); irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888);
rb = &irb->Base;
irb->Base.Width = depth_irb->Base.Width; irb->Base.Width = depth_irb->Base.Width;
irb->Base.Height = depth_irb->Base.Height; irb->Base.Height = depth_irb->Base.Height;
intel_renderbuffer_set_region(irb, depth_irb->region); intel_renderbuffer_set_region(irb, depth_irb->region);

View File

@@ -606,7 +606,6 @@ static GLboolean
intel_init_bufmgr(intelScreenPrivate *intelScreen) intel_init_bufmgr(intelScreenPrivate *intelScreen)
{ {
int gem_kernel = 0; int gem_kernel = 0;
GLboolean gem_supported;
struct drm_i915_getparam gp; struct drm_i915_getparam gp;
__DRIscreenPrivate *spriv = intelScreen->driScrnPriv; __DRIscreenPrivate *spriv = intelScreen->driScrnPriv;
int num_fences = 0; int num_fences = 0;
@@ -621,13 +620,8 @@ intel_init_bufmgr(intelScreenPrivate *intelScreen)
/* If we've got a new enough DDX that's initializing GEM and giving us /* If we've got a new enough DDX that's initializing GEM and giving us
* object handles for the shared buffers, use that. * object handles for the shared buffers, use that.
*/ */
if (intelScreen->driScrnPriv->dri2.enabled) if (!intelScreen->driScrnPriv->dri2.enabled &&
gem_supported = GL_TRUE; intelScreen->driScrnPriv->ddx_version.minor < 9) {
else if (intelScreen->driScrnPriv->ddx_version.minor >= 9 &&
gem_kernel &&
intelScreen->front.bo_handle != -1)
gem_supported = GL_TRUE;
else {
fprintf(stderr, "[%s:%u] Error initializing GEM.\n", fprintf(stderr, "[%s:%u] Error initializing GEM.\n",
__func__, __LINE__); __func__, __LINE__);
return GL_FALSE; return GL_FALSE;

View File

@@ -56,7 +56,7 @@ intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
.y2 = sarea->planeB_y + sarea->planeB_h }; .y2 = sarea->planeB_y + sarea->planeB_h };
GLint areaA = driIntersectArea( drw_rect, planeA_rect ); GLint areaA = driIntersectArea( drw_rect, planeA_rect );
GLint areaB = driIntersectArea( drw_rect, planeB_rect ); GLint areaB = driIntersectArea( drw_rect, planeB_rect );
GLuint flags = dPriv->vblFlags; GLuint flags;
/* Update vblank info /* Update vblank info
*/ */