Merge "OpenGL tests: Fix unused variables"
This commit is contained in:
commit
f8954c81a4
@ -166,7 +166,6 @@ main(int argc, char *argv[])
|
||||
int rv, opt;
|
||||
bool error;
|
||||
char *chptr;
|
||||
unsigned int pass;
|
||||
char cmd[MAXCMD];
|
||||
string str;
|
||||
|
||||
@ -293,14 +292,12 @@ main(int argc, char *argv[])
|
||||
// Use the upper third of the display for the reference frame and
|
||||
// the middle third for the equivalence frame.
|
||||
unsigned int refHeight = height / 3;
|
||||
unsigned int refPosY = 0; // Reference frame Y position
|
||||
unsigned int refPosX = 0; // Reference frame X position
|
||||
unsigned int refWidth = width - refPosX;
|
||||
if ((refWidth & refFormat->wMod) != 0) {
|
||||
refWidth += refFormat->wMod - (refWidth % refFormat->wMod);
|
||||
}
|
||||
unsigned int equivHeight = height / 3;
|
||||
unsigned int equivPosY = refHeight; // Equivalence frame Y position
|
||||
unsigned int equivPosX = 0; // Equivalence frame X position
|
||||
unsigned int equivWidth = width - equivPosX;
|
||||
if ((equivWidth & equivFormat->wMod) != 0) {
|
||||
|
@ -338,7 +338,6 @@ int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int rv, opt;
|
||||
char *chptr;
|
||||
bool error;
|
||||
string str;
|
||||
char cmd[MAXCMD];
|
||||
|
@ -204,7 +204,6 @@ main(int argc, char *argv[])
|
||||
{
|
||||
int rv, opt;
|
||||
char *chptr;
|
||||
bool error;
|
||||
string str;
|
||||
char cmd[MAXCMD];
|
||||
|
||||
@ -367,7 +366,6 @@ static Rectangle parseRect(string rectStr)
|
||||
istringstream in(rectStr);
|
||||
const struct hwcTestGraphicFormat *format;
|
||||
Rectangle rect;
|
||||
struct hwc_rect hwcRect;
|
||||
|
||||
// Graphic Format
|
||||
in >> str;
|
||||
|
@ -36,7 +36,6 @@
|
||||
// Function Prototypes
|
||||
static void printGLString(const char *name, GLenum s);
|
||||
static void checkEglError(const char* op, EGLBoolean returnVal = EGL_TRUE);
|
||||
static void checkGlError(const char* op);
|
||||
static void printEGLConfiguration(EGLDisplay dpy, EGLConfig config);
|
||||
|
||||
using namespace std;
|
||||
@ -52,8 +51,6 @@ void hwcTestInitDisplay(bool verbose, EGLDisplay *dpy, EGLSurface *surface,
|
||||
{
|
||||
static EGLContext context;
|
||||
|
||||
int rv;
|
||||
|
||||
EGLBoolean returnValue;
|
||||
EGLConfig myConfig = {0};
|
||||
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 y = 0; y < gBuf->getHeight(); y++) {
|
||||
uint32_t val = pixel;
|
||||
hwcTestSetPixel(gBuf, buf, x, y, (x < gBuf->getWidth())
|
||||
? 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)
|
||||
{
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user