tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use -Werror in system/core/libpixelflinger

Browse source 
* Remove unused local variables.
* Suppress/fix warning of unused functions, conditionally used variables.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: If92bc79f15a0486364da0389defbb2d43b3bd6ea
This commit is contained in:
Chih-Hung Hsieh 2017-10-26 11:19:43 -07:00
parent 0d323c12df
commit c7f344e9a9
16 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libpixelflinger/Android.mk
View file

@ -25,6 +25,8 @@ PIXELFLINGER_SRC_FILES:= \
buffer.cpp
PIXELFLINGER_CFLAGS := -fstrict-aliasing -fomit-frame-pointer
PIXELFLINGER_CFLAGS += -Wall -Werror
PIXELFLINGER_CFLAGS += -Wno-unused-function
PIXELFLINGER_SRC_FILES_arm := \
codeflinger/ARMAssembler.cpp \

6
libpixelflinger/codeflinger/Arm64Assembler.cpp
View file

@ -151,11 +151,11 @@
namespace android {
static const char* shift_codes[] =
static __unused const char* shift_codes[] =
{
"LSL", "LSR", "ASR", "ROR"
};
static const char *cc_codes[] =
static __unused const char *cc_codes[] =
{
"EQ", "NE", "CS", "CC", "MI",
"PL", "VS", "VC", "HI", "LS",
@ -984,7 +984,7 @@ uint32_t ArmToArm64Assembler::reg_post(int /*Rm*/)
// A64 instructions
// ----------------------------------------------------------------------------
static const char * dataTransferOpName[] =
static __unused const char * dataTransferOpName[] =
{
"LDR","LDRB","LDRH","STR","STRB","STRH"
};

3
libpixelflinger/codeflinger/GGLAssembler.cpp
View file

@ -94,8 +94,6 @@ int GGLAssembler::scanline(const needs_t& needs, context_t const* c)
int GGLAssembler::scanline_core(const needs_t& needs, context_t const* c)
{
int64_t duration = ggl_system_time();
mBlendFactorCached = 0;
mBlending = 0;
mMasking = 0;
@ -353,7 +351,6 @@ void GGLAssembler::build_scanline_prolog(
fragment_parts_t& parts, const needs_t& needs)
{
Scratch scratches(registerFile());
int Rctx = mBuilderContext.Rctx;
// compute count
comment("compute ct (# of pixels to process)");

1
libpixelflinger/codeflinger/load_store.cpp
View file

@ -232,7 +232,6 @@ void GGLAssembler::expand(integer_t& dst, const integer_t& src, int dbits)
void GGLAssembler::downshift(
pixel_t& d, int component, component_t s, const reg_t& dither)
{
const needs_t& needs = mBuilderContext.needs;
Scratch scratches(registerFile());
int sh = s.h;

11
libpixelflinger/codeflinger/texturing.cpp
View file

@ -41,7 +41,6 @@ namespace android {
void GGLAssembler::init_iterated_color(fragment_parts_t& parts, const reg_t& x)
{
context_t const* c = mBuilderContext.c;
const needs_t& needs = mBuilderContext.needs;
if (mSmooth) {
// NOTE: we could take this case in the mDithering + !mSmooth case,
@ -324,9 +323,7 @@ void GGLAssembler::init_textures(
tex_coord_t* coords,
const reg_t& x, const reg_t& y)
{
context_t const* c = mBuilderContext.c;
const needs_t& needs = mBuilderContext.needs;
int Rctx = mBuilderContext.Rctx;
int Rx = x.reg;
int Ry = y.reg;
@ -402,10 +399,6 @@ void GGLAssembler::init_textures(
void GGLAssembler::build_textures( fragment_parts_t& parts,
Scratch& regs)
{
context_t const* c = mBuilderContext.c;
const needs_t& needs = mBuilderContext.needs;
int Rctx = mBuilderContext.Rctx;
// We don't have a way to spill registers automatically
// spill depth and AA regs, when we know we may have to.
// build the spill list...
@ -434,7 +427,6 @@ void GGLAssembler::build_textures( fragment_parts_t& parts,
Spill spill(registerFile(), *this, spill_list);
const bool multiTexture = mTextureMachine.activeUnits > 1;
for (int i=0 ; i<GGL_TEXTURE_UNIT_COUNT; i++) {
const texture_unit_t& tmu = mTextureMachine.tmu[i];
if (tmu.format_idx == 0)
@ -442,7 +434,7 @@ void GGLAssembler::build_textures( fragment_parts_t& parts,
pointer_t& txPtr = parts.coords[i].ptr;
pixel_t& texel = parts.texel[i];
// repeat...
if ((tmu.swrap == GGL_NEEDS_WRAP_11) &&
(tmu.twrap == GGL_NEEDS_WRAP_11))
@ -656,7 +648,6 @@ void GGLAssembler::build_textures( fragment_parts_t& parts,
void GGLAssembler::build_iterate_texture_coordinates(
const fragment_parts_t& parts)
{
const bool multiTexture = mTextureMachine.activeUnits > 1;
for (int i=0 ; i<GGL_TEXTURE_UNIT_COUNT; i++) {
const texture_unit_t& tmu = mTextureMachine.tmu[i];
if (tmu.format_idx == 0)

1
libpixelflinger/include/private/pixelflinger/ggl_fixed.h
View file

@ -497,7 +497,6 @@ inline GGLfixed gglMulSubx(GGLfixed x, GGLfixed y, GGLfixed a, int shift)
{
GGLfixed result;
int rshift;
asm("smull %x[result], %w[x], %w[y] \n"
"lsr %x[result], %x[result], %x[shift] \n"

1
libpixelflinger/raster.cpp
View file

@ -153,7 +153,6 @@ GGLint gglBitBlit(GGLContext* con, int tmu, GGLint crop[4], GGLint where[4])
GGLint h = where[3];
// exclsively enable this tmu
const GGLSurface& cbSurface = c->state.buffers.color.s;
c->procs.activeTexture(c, tmu);
c->procs.disable(c, GGL_W_LERP);

1
libpixelflinger/scanline.cpp
View file

@ -2144,7 +2144,6 @@ void scanline_t32cb16(context_t* c)
const int32_t u = (c->state.texture[0].shade.is0>>16) + x;
const int32_t v = (c->state.texture[0].shade.it0>>16) + y;
uint32_t *src = reinterpret_cast<uint32_t*>(tex->data)+(u+(tex->stride*v));
int sR, sG, sB;
uint32_t s, d;
if (ct==1 || uintptr_t(dst)&2) {

2
libpixelflinger/tests/arch-arm64/assembler/Android.mk
View file

@ -14,6 +14,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= test-pixelflinger-arm64-assembler-test
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE_TAGS := tests
LOCAL_MULTILIB := 64

2
libpixelflinger/tests/arch-arm64/col32cb16blend/Android.mk
View file

@ -11,6 +11,8 @@ LOCAL_C_INCLUDES :=
LOCAL_MODULE:= test-pixelflinger-arm64-col32cb16blend
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE_TAGS := tests
LOCAL_MULTILIB := 64

2
libpixelflinger/tests/arch-arm64/disassembler/Android.mk
View file

@ -9,6 +9,8 @@ LOCAL_SHARED_LIBRARIES :=
LOCAL_MODULE:= test-pixelflinger-arm64-disassembler-test
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE_TAGS := tests
LOCAL_MULTILIB := 64

2
libpixelflinger/tests/arch-arm64/t32cb16blend/Android.mk
View file

@ -11,6 +11,8 @@ LOCAL_C_INCLUDES :=
LOCAL_MODULE:= test-pixelflinger-arm64-t32cb16blend
LOCAL_CFLAGS := -Wall -Werror
LOCAL_MODULE_TAGS := tests
LOCAL_MULTILIB := 64

2
libpixelflinger/tests/codegen/Android.mk
View file

@ -13,6 +13,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= test-opengl-codegen
LOCAL_CFLAGS:= -Wall -Werror
LOCAL_MODULE_TAGS := tests
include $(BUILD_NATIVE_TEST)

10
libpixelflinger/tests/codegen/codegen.cpp
View file

@ -40,9 +40,9 @@ public:
const AssemblyKey<needs_t>& key() const { return mKey; }
};
#if ANDROID_ARM_CODEGEN
static void ggl_test_codegen(uint32_t n, uint32_t p, uint32_t t0, uint32_t t1)
{
#if ANDROID_ARM_CODEGEN
GGLContext* c;
gglInit(&c);
needs_t needs;
@ -73,10 +73,12 @@ static void ggl_test_codegen(uint32_t n, uint32_t p, uint32_t t0, uint32_t t1)
printf("error %08x (%s)\n", err, strerror(-err));
}
gglUninit(c);
#else
printf("This test runs only on ARM, Arm64 or MIPS\n");
#endif
}
#else
static void ggl_test_codegen(uint32_t, uint32_t, uint32_t, uint32_t) {
printf("This test runs only on ARM, Arm64 or MIPS\n");
}
#endif
int main(int argc, char** argv)
{

2
libpixelflinger/tests/gglmul/Android.mk
View file

@ -11,6 +11,8 @@ LOCAL_C_INCLUDES := \
LOCAL_MODULE:= test-pixelflinger-gglmul
LOCAL_CFLAGS:= -Wall -Werror
LOCAL_MODULE_TAGS := tests
include $(BUILD_NATIVE_TEST)

2
libpixelflinger/trap.cpp
View file

@ -349,7 +349,6 @@ void linex_validate(void *con, const GGLcoord* v0, const GGLcoord* v1, GGLcoord
static void linex(void *con, const GGLcoord* v0, const GGLcoord* v1, GGLcoord width)
{
GGL_CONTEXT(c, con);
GGLcoord v[4][2];
v[0][0] = v0[0]; v[0][1] = v0[1];
v[1][0] = v1[0]; v[1][1] = v1[1];
@ -377,7 +376,6 @@ static void linex(void *con, const GGLcoord* v0, const GGLcoord* v1, GGLcoord wi
static void aa_linex(void *con, const GGLcoord* v0, const GGLcoord* v1, GGLcoord width)
{
GGL_CONTEXT(c, con);
GGLcoord v[4][2];
v[0][0] = v0[0]; v[0][1] = v0[1];
v[1][0] = v1[0]; v[1][1] = v1[1];