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

Commit 44d93a06 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of e375c689 to nyc-dev-plus-aosp 

Change-Id: Ic6b535f7b078b674603c2df6d4ff66b29ff54c26
parents f2e886c2 e375c689

opengl/libs/hooks.h

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,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
@@ -116,7 +116,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
@@ -156,7 +156,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 {

opengl/tests/hwc/hwcRects.cpp

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ const struct hwc_rect defaultDisplayFrame = {0, 0, 100, 100}; 
#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 {