projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a80fe4
)
intel: Remove unused stored values reported by clang.
author
Eric Anholt
<eric@anholt.net>
Tue, 22 Dec 2009 18:58:47 +0000
(10:58 -0800)
committer
Eric Anholt
<eric@anholt.net>
Tue, 22 Dec 2009 22:20:26 +0000
(14:20 -0800)
src/mesa/drivers/dri/intel/intel_blit.c
patch
|
blob
|
history
src/mesa/drivers/dri/intel/intel_fbo.c
patch
|
blob
|
history
src/mesa/drivers/dri/intel/intel_pixel_draw.c
patch
|
blob
|
history
src/mesa/drivers/dri/intel/intel_screen.c
patch
|
blob
|
history
src/mesa/drivers/dri/intel/intel_swapbuffers.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/intel/intel_blit.c
b/src/mesa/drivers/dri/intel/intel_blit.c
index cdf1408cd3314c1b86094398d09a632816c7c446..da9beba030d5597374821991cea18fd96da4b2eb 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_blit.c
+++ b/
src/mesa/drivers/dri/intel/intel_blit.c
@@
-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)
return;
if (!intel)
return;
- intelScreen = intel->intelScreen;
-
/* The LOCK_HARDWARE is required for the cliprects. Buffer offsets
* should work regardless.
*/
/* The LOCK_HARDWARE is required for the cliprects. Buffer offsets
* should work regardless.
*/
diff --git
a/src/mesa/drivers/dri/intel/intel_fbo.c
b/src/mesa/drivers/dri/intel/intel_fbo.c
index 608f75b82406e93029db5f82e2a3af7432dae6e7..fc502a87d37fe5557b93b4188f0c61c47fc9c10f 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/
src/mesa/drivers/dri/intel/intel_fbo.c
@@
-398,8
+398,6
@@
static GLboolean
intel_update_wrapper(GLcontext *ctx, struct intel_renderbuffer *irb,
struct gl_texture_image *texImage)
{
intel_update_wrapper(GLcontext *ctx, struct intel_renderbuffer *irb,
struct gl_texture_image *texImage)
{
- gl_format texFormat;
-
if (texImage->TexFormat == MESA_FORMAT_ARGB8888) {
irb->Base.DataType = GL_UNSIGNED_BYTE;
DBG("Render to RGBA8 texture OK\n");
if (texImage->TexFormat == MESA_FORMAT_ARGB8888) {
irb->Base.DataType = GL_UNSIGNED_BYTE;
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._BaseFormat = _mesa_base_fbo_format(ctx, irb->Base.InternalFormat);
irb->Base.Width = texImage->Width;
irb->Base.InternalFormat = texImage->InternalFormat;
irb->Base._BaseFormat = _mesa_base_fbo_format(ctx, irb->Base.InternalFormat);
irb->Base.Width = texImage->Width;
diff --git
a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 9b382e36225c4e98a1f50b209c9d8ec951f0b417..b870e9315e0ce75f71f18165c1b031eeffad010c 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/
src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@
-69,7
+69,6
@@
intel_stencil_drawpixels(GLcontext * ctx,
GLfloat vertices[4][2];
struct intel_renderbuffer *irb;
struct intel_renderbuffer *depth_irb;
GLfloat vertices[4][2];
struct intel_renderbuffer *irb;
struct intel_renderbuffer *depth_irb;
- struct gl_renderbuffer *rb;
struct gl_pixelstore_attrib old_unpack;
GLstencil *stencil_pixels;
int row, y1, y2;
struct gl_pixelstore_attrib old_unpack;
GLstencil *stencil_pixels;
int row, y1, y2;
@@
-170,7
+169,6
@@
intel_stencil_drawpixels(GLcontext * ctx,
*/
depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH);
irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888);
*/
depth_irb = intel_get_renderbuffer(ctx->DrawBuffer, BUFFER_DEPTH);
irb = intel_create_renderbuffer(MESA_FORMAT_ARGB8888);
- rb = &irb->Base;
irb->Base.Width = depth_irb->Base.Width;
irb->Base.Height = depth_irb->Base.Height;
intel_renderbuffer_set_region(irb, depth_irb->region);
irb->Base.Width = depth_irb->Base.Width;
irb->Base.Height = depth_irb->Base.Height;
intel_renderbuffer_set_region(irb, depth_irb->region);
diff --git
a/src/mesa/drivers/dri/intel/intel_screen.c
b/src/mesa/drivers/dri/intel/intel_screen.c
index 2c5a884a9b48fabdb0af8141258d405bc1a50057..68e8db1de677f07d95f902f3e9027b76cddc7e84 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_screen.c
+++ b/
src/mesa/drivers/dri/intel/intel_screen.c
@@
-606,7
+606,6
@@
static GLboolean
intel_init_bufmgr(intelScreenPrivate *intelScreen)
{
int gem_kernel = 0;
intel_init_bufmgr(intelScreenPrivate *intelScreen)
{
int gem_kernel = 0;
- GLboolean gem_supported;
struct drm_i915_getparam gp;
__DRIscreenPrivate *spriv = intelScreen->driScrnPriv;
int num_fences = 0;
struct drm_i915_getparam gp;
__DRIscreenPrivate *spriv = intelScreen->driScrnPriv;
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
* object handles for the shared buffers, use that.
*/
/* If we've got a new enough DDX that's initializing GEM and giving us
* object handles for the shared buffers, use that.
*/
- if (intelScreen->driScrnPriv->dri2.enabled)
- gem_supported = GL_TRUE;
- else if (intelScreen->driScrnPriv->ddx_version.minor >= 9 &&
- gem_kernel &&
- intelScreen->front.bo_handle != -1)
- gem_supported = GL_TRUE;
- else {
+ if (!intelScreen->driScrnPriv->dri2.enabled &&
+ intelScreen->driScrnPriv->ddx_version.minor < 9) {
fprintf(stderr, "[%s:%u] Error initializing GEM.\n",
__func__, __LINE__);
return GL_FALSE;
fprintf(stderr, "[%s:%u] Error initializing GEM.\n",
__func__, __LINE__);
return GL_FALSE;
diff --git
a/src/mesa/drivers/dri/intel/intel_swapbuffers.c
b/src/mesa/drivers/dri/intel/intel_swapbuffers.c
index 7d035b9f6e41aff5f55a229eaafa70fc21c5b323..5ae124071871fd7d7405f6ba32a09e108041a3f3 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_swapbuffers.c
+++ b/
src/mesa/drivers/dri/intel/intel_swapbuffers.c
@@
-56,7
+56,7
@@
intelFixupVblank(struct intel_context *intel, __DRIdrawablePrivate *dPriv)
.y2 = sarea->planeB_y + sarea->planeB_h };
GLint areaA = driIntersectArea( drw_rect, planeA_rect );
GLint areaB = driIntersectArea( drw_rect, planeB_rect );
.y2 = sarea->planeB_y + sarea->planeB_h };
GLint areaA = driIntersectArea( drw_rect, planeA_rect );
GLint areaB = driIntersectArea( drw_rect, planeB_rect );
- GLuint flags
= dPriv->vblFlags
;
+ GLuint flags;
/* Update vblank info
*/
/* Update vblank info
*/