Merge "Fix warnings in frameworks/native/opengl/tests" into nyc-dev (6ebbb2d3) · Commits · e / os / android_frameworks_native

opengl/tests/hwc/Android.mk

+5 −5

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE_TAGS := tests
		LOCAL_MODULE:= libhwcTest
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcTestLib.cpp
		LOCAL_C_INCLUDES += system/extras/tests/include \
		@@ -32,7 +32,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcStress
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcStress.cpp

		@@ -62,7 +62,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcRects
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcRects.cpp

		@@ -92,7 +92,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcColorEquiv
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcColorEquiv.cpp

		@@ -122,7 +122,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

		LOCAL_MODULE:= hwcCommit
		LOCAL_MODULE_TAGS := tests
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
		LOCAL_CFLAGS := -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES -Wall -Wextra -Werror
		LOCAL_CXX_STL := libc++
		LOCAL_SRC_FILES:= hwcCommit.cpp

opengl/tests/hwc/hwcColorEquiv.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -62,6 +62,8 @@
		* frame for cases where an equivalent color does not exist.
		*/

		#define LOG_TAG "hwcColorEquivTest"

		#include <algorithm>
		#include <assert.h>
		#include <cerrno>
		@@ -87,7 +89,6 @@

		#include <ui/GraphicBuffer.h>

		#define LOG_TAG "hwcColorEquivTest"
		#include <utils/Log.h>
		#include <testUtil.h>

opengl/tests/hwc/hwcCommit.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -70,6 +70,8 @@
		* made and reported for each of the known graphic format.
		*/

		#define LOG_TAG "hwcCommitTest"

		#include <algorithm>
		#include <assert.h>
		#include <cerrno>
		@@ -98,7 +100,6 @@

		#include <ui/GraphicBuffer.h>

		#define LOG_TAG "hwcCommitTest"
		#include <utils/Log.h>
		#include <testUtil.h>

		@@ -120,8 +121,6 @@ const uint32_t defaultBlend = HWC_BLENDING_NONE;
		const ColorFract defaultColor(0.5, 0.5, 0.5);
		const float defaultAlpha = 1.0; // Opaque
		const HwcTestDim defaultSourceDim(1, 1);
		const struct hwc_rect defaultSourceCrop = {0, 0, 1, 1};
		const struct hwc_rect defaultDisplayFrame = {0, 0, 100, 100};

		// Global Constants
		const uint32_t printFieldWidth = 2;

opengl/tests/hwc/hwcRects.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,6 +80,8 @@
		* a list of attributes and the format of their expected value.
		*/

		#define LOG_TAG "hwcRectsTest"

		#include <algorithm>
		#include <assert.h>
		#include <cerrno>
		@@ -105,8 +107,6 @@
		#include <GLES2/gl2ext.h>

		#include <ui/GraphicBuffer.h>

		#define LOG_TAG "hwcRectsTest"
		#include <utils/Log.h>
		#include <testUtil.h>

opengl/tests/hwc/hwcStress.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@
		* a different color from the rest of the rectangle.
		*/

		#define LOG_TAG "hwcStressTest"

		#include <algorithm>
		#include <assert.h>
		#include <cerrno>
		@@ -103,7 +105,6 @@

		#include <ui/GraphicBuffer.h>

		#define LOG_TAG "hwcStressTest"
		#include <utils/Log.h>
		#include <testUtil.h>