from osmesa, radeon and r600 classic drivers.
diff --git a/src/mesa/drivers/dri/r600/evergreen_fragprog.c b/src/mesa/drivers/dri/r600/evergreen_fragprog.c
index cc584ca..10c88d7 100644
--- a/src/mesa/drivers/dri/r600/evergreen_fragprog.c
+++ b/src/mesa/drivers/dri/r600/evergreen_fragprog.c
@@ -498,7 +498,6 @@ GLboolean evergreenSetupFragmentProgram(struct gl_context * ctx)
unsigned int ui, i;
unsigned int unNumOfReg;
unsigned int unBit;
- GLuint exportCount;
GLboolean point_sprite = GL_FALSE;
if(GL_FALSE == fp->loaded)
@@ -717,8 +716,6 @@ GLboolean evergreenSetupFragmentProgram(struct gl_context * ctx)
}
}
- exportCount = (evergreen->SQ_PGM_EXPORTS_PS.u32All & EXPORT_MODE_mask) / (1 << EXPORT_MODE_shift);
-
return GL_TRUE;
}
diff --git a/src/mesa/drivers/dri/r600/evergreen_render.c b/src/mesa/drivers/dri/r600/evergreen_render.c
index 74563ca..7016063 100644
--- a/src/mesa/drivers/dri/r600/evergreen_render.c
+++ b/src/mesa/drivers/dri/r600/evergreen_render.c
@@ -689,8 +689,6 @@ static void evergreenAlignDataToDword(struct gl_context *ctx,
static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count)
{
context_t *context = EVERGREEN_CONTEXT(ctx);
- GLuint stride;
- int ret;
int i, index;
EVERGREEN_STATECHANGE(context, vtx);
@@ -700,8 +698,6 @@ static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client
struct radeon_aos *aos = &context->radeon.tcl.aos[index];
i = context->stream_desc[index].element;
- stride = (input[i]->StrideB == 0) ? getTypeSize(input[i]->Type) * input[i]->Size : input[i]->StrideB;
-
if (input[i]->Type == GL_DOUBLE || input[i]->Type == GL_UNSIGNED_INT || input[i]->Type == GL_INT
#if MESA_BIG_ENDIAN
|| getTypeSize(input[i]->Type) != 4
@@ -781,10 +777,6 @@ static void evergreenSetupStreams(struct gl_context *ctx, const struct gl_client
RADEON_GEM_DOMAIN_GTT, 0);
}
}
-
- ret = radeon_cs_space_check_with_bo(context->radeon.cmdbuf.cs,
- first_elem(&context->radeon.dma.reserved)->bo,
- RADEON_GEM_DOMAIN_GTT, 0);
}
static void evergreenFreeData(struct gl_context *ctx)
diff --git a/src/mesa/drivers/dri/r600/evergreen_vertprog.c b/src/mesa/drivers/dri/r600/evergreen_vertprog.c
index 117916a..a968eaf 100644
--- a/src/mesa/drivers/dri/r600/evergreen_vertprog.c
+++ b/src/mesa/drivers/dri/r600/evergreen_vertprog.c
@@ -454,11 +454,6 @@ static void evergreenTranslateAttrib(struct gl_context *ctx, GLuint unLoc, int c
StreamDesc * pStreamDesc = &(context->stream_desc[context->nNumActiveAos]);
- GLuint stride;
-
- stride = (input->StrideB == 0) ? evergreen_getTypeSize(input->Type) * input->Size
- : input->StrideB;
-
if (input->Type == GL_DOUBLE || input->Type == GL_UNSIGNED_INT || input->Type == GL_INT
#if MESA_BIG_ENDIAN
|| evergreen_getTypeSize(input->Type) != 4
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 216ff0b..bc58695 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -954,7 +954,6 @@ GLboolean assemble_vfetch_instruction(r700_AssemblerBase* pAsm,
VTX_FETCH_METHOD* pFetchMethod)
{
GLuint client_size_inbyte;
- GLuint data_format;
GLuint mega_fetch_count;
GLuint is_mega_fetch_flag;
@@ -975,8 +974,6 @@ GLboolean assemble_vfetch_instruction(r700_AssemblerBase* pAsm,
vfetch_instruction_ptr = assembled_vfetch_instruction_ptr;
}
- data_format = GetSurfaceFormat(dataElementType, number_of_elements, &client_size_inbyte);
-
if(GL_TRUE == pFetchMethod->bEnableMini) //More conditions here
{
//TODO : mini fetch
@@ -2668,8 +2665,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
BITS sel;
BITS chan;
- BITS rel;
- BITS neg;
GLuint src;
@@ -2711,8 +2706,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
- rel = src_rel [src];
- neg = src_neg [src];
if (is_const( sel ))
{
@@ -2731,8 +2724,6 @@ GLboolean check_scalar(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
- rel = src_rel [src];
- neg = src_neg [src];
if( is_gpr(sel) )
{
@@ -2767,8 +2758,6 @@ GLboolean check_vector(r700_AssemblerBase* pAsm,
BITS sel;
BITS chan;
- BITS rel;
- BITS neg;
BITS src_sel [3] = {0,0,0};
BITS src_chan[3] = {0,0,0};
@@ -2809,8 +2798,6 @@ GLboolean check_vector(r700_AssemblerBase* pAsm,
{
sel = src_sel [src];
chan = src_chan[src];
- rel = src_rel [src];
- neg = src_neg [src];
bank_swizzle = alu_instruction_ptr->m_Word1.f.bank_swizzle;
@@ -4388,7 +4375,6 @@ GLboolean assemble_MAD(struct r700_AssemblerBase *pAsm)
GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
{
unsigned int dstReg;
- unsigned int dstType;
checkop1(pAsm);
int tmp = gethelpr(pAsm);
@@ -4397,7 +4383,6 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
return GL_FALSE;
}
dstReg = pAsm->D.dst.reg;
- dstType = pAsm->D.dst.rtype;
/* dst.xw, <- 1.0 */
if( pAsm->D.dst.writex || pAsm->D.dst.writew )
diff --git a/src/mesa/drivers/dri/r600/r700_chip.c b/src/mesa/drivers/dri/r600/r700_chip.c
index c653c08..c10b71b 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.c
+++ b/src/mesa/drivers/dri/r600/r700_chip.c
@@ -737,7 +737,6 @@ static void r700SendPSState(struct gl_context *ctx, struct radeon_state_atom *at
context_t *context = R700_CONTEXT(ctx);
R700_CHIP_CONTEXT *r700 = R700_CONTEXT_STATES(context);
struct radeon_bo * pbo;
- struct radeon_bo * pbo_const;
BATCH_LOCALS(&context->radeon);
radeon_print(RADEON_STATE, RADEON_VERBOSE, "%s\n", __func__);
@@ -767,7 +766,6 @@ static void r700SendPSState(struct gl_context *ctx, struct radeon_state_atom *at
R600_OUT_BATCH_REGVAL(SQ_LOOP_CONST_0, 0x01000FFF);
END_BATCH();
- pbo_const = (struct radeon_bo *)r700GetActiveFpShaderConstBo(GL_CONTEXT(context));
//TODO : set up shader const
COMMIT_BATCH();
diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index a565c9f..1927aa0 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -596,8 +596,6 @@ static void r700AlignDataToDword(struct gl_context *ctx,
static void r700SetupStreams(struct gl_context *ctx, const struct gl_client_array *input[], int count)
{
context_t *context = R700_CONTEXT(ctx);
- GLuint stride;
- int ret;
int i, index;
R600_STATECHANGE(context, vtx);
@@ -607,8 +605,6 @@ static void r700SetupStreams(struct gl_context *ctx, const struct gl_client_arra
struct radeon_aos *aos = &context->radeon.tcl.aos[index];
i = context->stream_desc[index].element;
- stride = (input[i]->StrideB == 0) ? getTypeSize(input[i]->Type) * input[i]->Size : input[i]->StrideB;
-
if (input[i]->Type == GL_DOUBLE || input[i]->Type == GL_UNSIGNED_INT || input[i]->Type == GL_INT
#if MESA_BIG_ENDIAN
|| getTypeSize(input[i]->Type) != 4
@@ -688,10 +684,6 @@ static void r700SetupStreams(struct gl_context *ctx, const struct gl_client_arra
RADEON_GEM_DOMAIN_GTT, 0);
}
}
-
- ret = radeon_cs_space_check_with_bo(context->radeon.cmdbuf.cs,
- first_elem(&context->radeon.dma.reserved)->bo,
- RADEON_GEM_DOMAIN_GTT, 0);
}
static void r700FreeData(struct gl_context *ctx)
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index b1e2742..7d0b0ac 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -465,11 +465,6 @@ static void r700TranslateAttrib(struct gl_context *ctx, GLuint unLoc, int count,
StreamDesc * pStreamDesc = &(context->stream_desc[context->nNumActiveAos]);
- GLuint stride;
-
- stride = (input->StrideB == 0) ? getTypeSize(input->Type) * input->Size
- : input->StrideB;
-
if (input->Type == GL_DOUBLE || input->Type == GL_UNSIGNED_INT || input->Type == GL_INT
#if MESA_BIG_ENDIAN
|| getTypeSize(input->Type) != 4
diff --git a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
index 78f73bf..8433dae 100644
--- a/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
@@ -526,9 +526,7 @@ static int bo_map(struct radeon_bo_int *bo, int write)
* -- Nicolai Hähnle, June 2008
*/
if (!(bo->domains & RADEON_GEM_DOMAIN_GTT)) {
- int p;
volatile int *buf = (int*)boml->screen->driScreen->pFB;
- p = *buf;
}
return 0;
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index c08b794..31224d1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -722,7 +722,6 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
radeon_bo_ref(bo);
} else {
uint32_t tiling_flags = 0, pitch = 0;
- int ret;
bo = radeon_bo_open(radeon->radeonScreen->bom,
buffers[i].name,
@@ -737,7 +736,6 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
continue;
}
- ret = radeon_bo_get_tiling(bo, &tiling_flags, &pitch);
if (tiling_flags & RADEON_TILING_MACRO)
bo->flags |= RADEON_BO_FLAGS_MACRO_TILE;
if (tiling_flags & RADEON_TILING_MICRO)
diff -purN mesa-7.12_orig//src/mesa/drivers/osmesa/osmesa.c mesa-7.12/src/mesa/drivers/osmesa/osmesa.c
--- mesa-7.12_orig//src/mesa/drivers/osmesa/osmesa.c 2011-06-10 12:05:04.000000000 +0200
+++ mesa-7.12/src/mesa/drivers/osmesa/osmesa.c 2011-10-19 15:48:51.080213224 +0200
@@ -795,14 +795,6 @@ osmesa_renderbuffer_storage(struct gl_co
GLenum internalFormat, GLuint width, GLuint height)
{
const OSMesaContext osmesa = OSMESA_CONTEXT(ctx);
- GLint bpc; /* bits per channel */
-
- if (rb->DataType == GL_UNSIGNED_BYTE)
- bpc = 8;
- else if (rb->DataType == GL_UNSIGNED_SHORT)
- bpc = 16;
- else
- bpc = 32;
/* Note: we can ignoring internalFormat for "window-system" renderbuffers */
(void) internalFormat;
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
