ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "OpenGL tests: Fix unused variables"

Browse Source
This commit is contained in:
Andreas Gampe 2014-12-02 18:24:56 +00:00 committed by Gerrit Code Review
commit f8954c81a4
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opengl/tests/hwc/hwcColorEquiv.cpp
View File

@ -166,7 +166,6 @@ main(int argc, char *argv[])
int rv, opt; int rv, opt;
bool error; bool error;
char *chptr; char *chptr;
unsigned int pass;
char cmd[MAXCMD]; char cmd[MAXCMD];
string str; string str;
@ -293,14 +292,12 @@ main(int argc, char *argv[])
// Use the upper third of the display for the reference frame and // Use the upper third of the display for the reference frame and
// the middle third for the equivalence frame. // the middle third for the equivalence frame.
unsigned int refHeight = height / 3; unsigned int refHeight = height / 3;
unsigned int refPosY = 0; // Reference frame Y position
unsigned int refPosX = 0; // Reference frame X position unsigned int refPosX = 0; // Reference frame X position
unsigned int refWidth = width - refPosX; unsigned int refWidth = width - refPosX;
if ((refWidth & refFormat->wMod) != 0) { if ((refWidth & refFormat->wMod) != 0) {
refWidth += refFormat->wMod - (refWidth % refFormat->wMod); refWidth += refFormat->wMod - (refWidth % refFormat->wMod);
} }
unsigned int equivHeight = height / 3; unsigned int equivHeight = height / 3;
unsigned int equivPosY = refHeight; // Equivalence frame Y position
unsigned int equivPosX = 0; // Equivalence frame X position unsigned int equivPosX = 0; // Equivalence frame X position
unsigned int equivWidth = width - equivPosX; unsigned int equivWidth = width - equivPosX;
if ((equivWidth & equivFormat->wMod) != 0) { if ((equivWidth & equivFormat->wMod) != 0) {

1
opengl/tests/hwc/hwcCommit.cpp
View File

@ -338,7 +338,6 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int rv, opt; int rv, opt;
char *chptr;
bool error; bool error;
string str; string str;
char cmd[MAXCMD]; char cmd[MAXCMD];

2
opengl/tests/hwc/hwcRects.cpp
View File

@ -204,7 +204,6 @@ main(int argc, char *argv[])
{ {
int rv, opt; int rv, opt;
char *chptr; char *chptr;
bool error;
string str; string str;
char cmd[MAXCMD]; char cmd[MAXCMD];
@ -367,7 +366,6 @@ static Rectangle parseRect(string rectStr)
istringstream in(rectStr); istringstream in(rectStr);
const struct hwcTestGraphicFormat *format; const struct hwcTestGraphicFormat *format;
Rectangle rect; Rectangle rect;
struct hwc_rect hwcRect;
// Graphic Format // Graphic Format
in >> str; in >> str;

12
opengl/tests/hwc/hwcTestLib.cpp
View File

@ -36,7 +36,6 @@
// Function Prototypes // Function Prototypes
static void printGLString(const char *name, GLenum s); static void printGLString(const char *name, GLenum s);
static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE); static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE);
static void checkGlError(const char* op);
static void printEGLConfiguration(EGLDisplay dpy, EGLConfig config); static void printEGLConfiguration(EGLDisplay dpy, EGLConfig config);
using namespace std; using namespace std;
@ -52,8 +51,6 @@ void hwcTestInitDisplay(bool verbose, EGLDisplay *dpy, EGLSurface *surface,
{ {
static EGLContext context; static EGLContext context;
int rv;
EGLBoolean returnValue; EGLBoolean returnValue;
EGLConfig myConfig = {0}; EGLConfig myConfig = {0};
EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; EGLint contextAttribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
@ -669,7 +666,6 @@ void hwcTestFillColor(GraphicBuffer *gBuf, ColorFract color, float alpha)
for (unsigned int x = 0; x < gBuf->getStride(); x++) { for (unsigned int x = 0; x < gBuf->getStride(); x++) {
for (unsigned int y = 0; y < gBuf->getHeight(); y++) { for (unsigned int y = 0; y < gBuf->getHeight(); y++) {
uint32_t val = pixel;
hwcTestSetPixel(gBuf, buf, x, y, (x < gBuf->getWidth()) hwcTestSetPixel(gBuf, buf, x, y, (x < gBuf->getWidth())
? pixel : testRand()); ? pixel : testRand());
} }
@ -966,14 +962,6 @@ static void checkEglError(const char* op, EGLBoolean returnVal)
} }
} }
static void checkGlError(const char* op)
{
for (GLint error = glGetError(); error; error
= glGetError()) {
testPrintE("after %s() glError (0x%x)", op, error);
}
}
static void printEGLConfiguration(EGLDisplay dpy, EGLConfig config) static void printEGLConfiguration(EGLDisplay dpy, EGLConfig config)
{ {