Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2192)

Unified Diff: gpu/command_buffer/common/gles2_cmd_format.h

Issue 511001: Adds a GLMock object so we can check the code is... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/build_gles2_cmd_buffer.py ('k') | gpu/command_buffer/common/gles2_cmd_format_autogen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/gles2_cmd_format.h
===================================================================
--- gpu/command_buffer/common/gles2_cmd_format.h (revision 35202)
+++ gpu/command_buffer/common/gles2_cmd_format.h (working copy)
@@ -8,8 +8,11 @@
#define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_
// This is here because service side code must include the system's version of
-// the GL headers where as client side code includes the Chrome version.
-#ifdef GLES2_GPU_SERVICE
+// the GL headers where as client side code includes the Chrome version. Also
+// the unit test code must include a mock GL header.
+#if defined(UNIT_TEST)
+#include "gpu/command_buffer/service/gl_mock.h"
+#elif defined(GLES2_GPU_SERVICE)
#include <GL/glew.h>
#if defined(OS_WIN)
#include <GL/wglew.h>
@@ -27,6 +30,8 @@
namespace gpu {
namespace gles2 {
+#pragma pack(push, 1)
+
#include "gpu/command_buffer/common/gles2_cmd_format_autogen.h"
// These are hand written commands.
@@ -273,6 +278,7 @@
COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, data_size) == 16,
OffsetOf_GetUniformLocationImmediate_data_size_not_16);
+#pragma pack(pop)
} // namespace gles2
} // namespace gpu
« no previous file with comments | « gpu/command_buffer/build_gles2_cmd_buffer.py ('k') | gpu/command_buffer/common/gles2_cmd_format_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698