Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e375c689 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix misc-macro-parentheses warnings in opengl." 

am: b09e70ce

* commit 'b09e70ce':
  Fix misc-macro-parentheses warnings in opengl.

Change-Id: I6778f23285bfa0115e0222f03b52ef4f871cc2f7
parents e80bc97a b09e70ce

opengl/libs/EGL/trace.cpp

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ EGLAPI gl_hooks_t gHooksSystrace = { 
#define CHECK_ERROR(_c, _api)                                             \

    GLenum status = GL_NO_ERROR;                                          \

    bool error = false;                                                   \

    while ((status = _c->glGetError()) != GL_NO_ERROR) {                  \

    while ((status = (_c)->glGetError()) != GL_NO_ERROR) {                \

        ALOGD("[" #_api "] 0x%x", status);                                \

        error = true;                                                     \

    }                                                                     \

opengl/libs/hooks.h

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ namespace android { 


#undef GL_ENTRY

#undef EGL_ENTRY

#define GL_ENTRY(_r, _api, ...) _r (*_api)(__VA_ARGS__);

#define EGL_ENTRY(_r, _api, ...) _r (*_api)(__VA_ARGS__);

#define GL_ENTRY(_r, _api, ...) _r (*(_api))(__VA_ARGS__);

#define EGL_ENTRY(_r, _api, ...) _r (*(_api))(__VA_ARGS__);



struct egl_t {

    #include "EGL/egl_entries.in"

opengl/tests/angeles/demo.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static void gluLookAt(GLfloat eyex, GLfloat eyey, GLfloat eyez, 
        y[2] /= mag;

    }



#define M(row,col)  m[col*4+row]

#define M(row,col)  m[(col)*4+(row)]

    M(0, 0) = x[0];

    M(0, 1) = x[1];

    M(0, 2) = x[2];

opengl/tests/hwc/hwcColorEquiv.cpp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ const float defaultEndDelay = 2.0; // Default delay after rendering graphics 
#define CMD_START_FRAMEWORK  "start 2>&1"



// Macros

#define NUMA(a) (sizeof(a) / sizeof(a [0])) // Num elements in an array

#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Num elements in an array

#define MEMCLR(addr, size) do { \

        memset((addr), 0, (size)); \

    } while (0)

opengl/tests/hwc/hwcCommit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ const struct blendType { 
#define CMD_START_FRAMEWORK  "start 2>&1"



// Macros

#define NUMA(a) (sizeof(a) / sizeof(a [0])) // Num elements in an array

#define NUMA(a) (sizeof(a) / sizeof((a)[0])) // Num elements in an array



// Local types

class Rectangle {