summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/precompile.h50
-rw-r--r--webkit/glue/gl_bindings_skia_cmd_buffer.cc192
2 files changed, 125 insertions, 117 deletions
diff --git a/build/precompile.h b/build/precompile.h
index 940d7302..73dc57f 100644
--- a/build/precompile.h
+++ b/build/precompile.h
@@ -22,6 +22,10 @@
// The Windows header needs to come before almost all the other
// Windows-specific headers.
#include <Windows.h>
+#include <dwmapi.h>
+#include <shellapi.h>
+#include <wincrypt.h> // 4
+#include <wtypes.h> // 2
// TODO(joi): Defines in atlbase.h cause conflicts; need to figure out
// if/how this family of headers can be included in the PCH; several
@@ -38,27 +42,31 @@
#include <atlwin.h> // 2
*/
-#include <commctrl.h> // 2
-#include <commdlg.h> // 3
-#include <cryptuiapi.h> // 2
-#include <dwmapi.h>
-#include <Objbase.h> // 2
-#include <objidl.h> // 1
-#include <ole2.h> // 1
-#include <oleacc.h> // 2
-#include <oleauto.h> // 1
-#include <oleidl.h> // 1
-#include <propkey.h> // 2
-#include <propvarutil.h> // 2
-#include <pstore.h> // 2
-#include <shellapi.h>
-#include <shlguid.h> // 1
-//#include <shlobj.h> TODO(joi): Caused conflicts, see if they can be resolved.
-#include <shlwapi.h> // 1
-#include <shobjidl.h> // 4
-#include <urlhist.h> // 2
-#include <wincrypt.h> // 4
-#include <wtypes.h> // 2
+// TODO(joi): Objbase.h and other files that rely on it bring in
+// [ #define interface struct ] which can cause problems in a
+// multi-platform build like Chrome's. Tried #undef-ing it, but
+// there are currently 118 targets that break if we do this, so
+// leaving out of the precompiled header for now.
+//#include <commctrl.h> // 2
+//#include <commdlg.h> // 3
+//#include <cryptuiapi.h> // 2
+//#include <Objbase.h> // 2
+//#include <objidl.h> // 1
+//#include <ole2.h> // 1
+//#include <oleacc.h> // 2
+//#include <oleauto.h> // 1
+//#include <oleidl.h> // 1
+//#include <propkey.h> // 2
+//#include <propvarutil.h> // 2
+//#include <pstore.h> // 2
+//#include <shlguid.h> // 1
+//#include <shlwapi.h> // 1
+//#include <shobjidl.h> // 4
+//#include <urlhist.h> // 2
+
+// TODO(joi): Caused other conflicts in addition to the 'interface' issue
+// above, see if they can be resolved.
+//#include <shlobj.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
index 73c99e6..bad2877 100644
--- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc
+++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc
@@ -16,104 +16,104 @@
namespace webkit_glue {
GrGLInterface* CreateCommandBufferSkiaGLBinding() {
- GrGLInterface* gl_interface = new GrGLInterface;
- gl_interface->fBindingsExported = kES2_GrGLBinding;
- gl_interface->fActiveTexture = glActiveTexture;
- gl_interface->fAttachShader = glAttachShader;
- gl_interface->fBindAttribLocation = glBindAttribLocation;
- gl_interface->fBindBuffer = glBindBuffer;
- gl_interface->fBindTexture = glBindTexture;
- gl_interface->fBlendColor = glBlendColor;
- gl_interface->fBlendFunc = glBlendFunc;
- gl_interface->fBufferData = glBufferData;
- gl_interface->fBufferSubData = glBufferSubData;
- gl_interface->fClear = glClear;
- gl_interface->fClearColor = glClearColor;
- gl_interface->fClearStencil = glClearStencil;
- gl_interface->fColorMask = glColorMask;
- gl_interface->fCompileShader = glCompileShader;
- gl_interface->fCompressedTexImage2D = glCompressedTexImage2D;
- gl_interface->fCreateProgram = glCreateProgram;
- gl_interface->fCreateShader = glCreateShader;
- gl_interface->fCullFace = glCullFace;
- gl_interface->fDeleteBuffers = glDeleteBuffers;
- gl_interface->fDeleteProgram = glDeleteProgram;
- gl_interface->fDeleteShader = glDeleteShader;
- gl_interface->fDeleteTextures = glDeleteTextures;
- gl_interface->fDepthMask = glDepthMask;
- gl_interface->fDisable = glDisable;
- gl_interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
- gl_interface->fDrawArrays = glDrawArrays;
- gl_interface->fDrawElements = glDrawElements;
- gl_interface->fEnable = glEnable;
- gl_interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
- gl_interface->fFrontFace = glFrontFace;
- gl_interface->fGenBuffers = glGenBuffers;
- gl_interface->fGenTextures = glGenTextures;
- gl_interface->fGetBufferParameteriv = glGetBufferParameteriv;
- gl_interface->fGetError = glGetError;
- gl_interface->fGetIntegerv = glGetIntegerv;
- gl_interface->fGetProgramInfoLog = glGetProgramInfoLog;
- gl_interface->fGetProgramiv = glGetProgramiv;
- gl_interface->fGetShaderInfoLog = glGetShaderInfoLog;
- gl_interface->fGetShaderiv = glGetShaderiv;
- gl_interface->fGetString = glGetString;
- gl_interface->fGetUniformLocation = glGetUniformLocation;
- gl_interface->fLineWidth = glLineWidth;
- gl_interface->fLinkProgram = glLinkProgram;
- gl_interface->fPixelStorei = glPixelStorei;
- gl_interface->fReadPixels = glReadPixels;
- gl_interface->fScissor = glScissor;
- gl_interface->fShaderSource = glShaderSource;
- gl_interface->fStencilFunc = glStencilFunc;
- gl_interface->fStencilFuncSeparate = glStencilFuncSeparate;
- gl_interface->fStencilMask = glStencilMask;
- gl_interface->fStencilMaskSeparate = glStencilMaskSeparate;
- gl_interface->fStencilOp = glStencilOp;
- gl_interface->fStencilOpSeparate = glStencilOpSeparate;
- gl_interface->fTexImage2D = glTexImage2D;
- gl_interface->fTexParameteri = glTexParameteri;
- gl_interface->fTexSubImage2D = glTexSubImage2D;
- gl_interface->fUniform1f = glUniform1f;
- gl_interface->fUniform1i = glUniform1i;
- gl_interface->fUniform1fv = glUniform1fv;
- gl_interface->fUniform1iv = glUniform1iv;
- gl_interface->fUniform2f = glUniform2f;
- gl_interface->fUniform2i = glUniform2i;
- gl_interface->fUniform2fv = glUniform2fv;
- gl_interface->fUniform2iv = glUniform2iv;
- gl_interface->fUniform3f = glUniform3f;
- gl_interface->fUniform3i = glUniform3i;
- gl_interface->fUniform3fv = glUniform3fv;
- gl_interface->fUniform3iv = glUniform3iv;
- gl_interface->fUniform4f = glUniform4f;
- gl_interface->fUniform4i = glUniform4i;
- gl_interface->fUniform4fv = glUniform4fv;
- gl_interface->fUniform4iv = glUniform4iv;
- gl_interface->fUniformMatrix2fv = glUniformMatrix2fv;
- gl_interface->fUniformMatrix3fv = glUniformMatrix3fv;
- gl_interface->fUniformMatrix4fv = glUniformMatrix4fv;
- gl_interface->fUseProgram = glUseProgram;
- gl_interface->fVertexAttrib4fv = glVertexAttrib4fv;
- gl_interface->fVertexAttribPointer = glVertexAttribPointer;
- gl_interface->fViewport = glViewport;
- gl_interface->fBindFramebuffer = glBindFramebuffer;
- gl_interface->fBindRenderbuffer = glBindRenderbuffer;
- gl_interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
- gl_interface->fDeleteFramebuffers = glDeleteFramebuffers;
- gl_interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
- gl_interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
- gl_interface->fFramebufferTexture2D = glFramebufferTexture2D;
- gl_interface->fGenFramebuffers = glGenFramebuffers;
- gl_interface->fGenRenderbuffers = glGenRenderbuffers;
- gl_interface->fGetFramebufferAttachmentParameteriv =
+ GrGLInterface* interface = new GrGLInterface;
+ interface->fBindingsExported = kES2_GrGLBinding;
+ interface->fActiveTexture = glActiveTexture;
+ interface->fAttachShader = glAttachShader;
+ interface->fBindAttribLocation = glBindAttribLocation;
+ interface->fBindBuffer = glBindBuffer;
+ interface->fBindTexture = glBindTexture;
+ interface->fBlendColor = glBlendColor;
+ interface->fBlendFunc = glBlendFunc;
+ interface->fBufferData = glBufferData;
+ interface->fBufferSubData = glBufferSubData;
+ interface->fClear = glClear;
+ interface->fClearColor = glClearColor;
+ interface->fClearStencil = glClearStencil;
+ interface->fColorMask = glColorMask;
+ interface->fCompileShader = glCompileShader;
+ interface->fCompressedTexImage2D = glCompressedTexImage2D;
+ interface->fCreateProgram = glCreateProgram;
+ interface->fCreateShader = glCreateShader;
+ interface->fCullFace = glCullFace;
+ interface->fDeleteBuffers = glDeleteBuffers;
+ interface->fDeleteProgram = glDeleteProgram;
+ interface->fDeleteShader = glDeleteShader;
+ interface->fDeleteTextures = glDeleteTextures;
+ interface->fDepthMask = glDepthMask;
+ interface->fDisable = glDisable;
+ interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
+ interface->fDrawArrays = glDrawArrays;
+ interface->fDrawElements = glDrawElements;
+ interface->fEnable = glEnable;
+ interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
+ interface->fFrontFace = glFrontFace;
+ interface->fGenBuffers = glGenBuffers;
+ interface->fGenTextures = glGenTextures;
+ interface->fGetBufferParameteriv = glGetBufferParameteriv;
+ interface->fGetError = glGetError;
+ interface->fGetIntegerv = glGetIntegerv;
+ interface->fGetProgramInfoLog = glGetProgramInfoLog;
+ interface->fGetProgramiv = glGetProgramiv;
+ interface->fGetShaderInfoLog = glGetShaderInfoLog;
+ interface->fGetShaderiv = glGetShaderiv;
+ interface->fGetString = glGetString;
+ interface->fGetUniformLocation = glGetUniformLocation;
+ interface->fLineWidth = glLineWidth;
+ interface->fLinkProgram = glLinkProgram;
+ interface->fPixelStorei = glPixelStorei;
+ interface->fReadPixels = glReadPixels;
+ interface->fScissor = glScissor;
+ interface->fShaderSource = glShaderSource;
+ interface->fStencilFunc = glStencilFunc;
+ interface->fStencilFuncSeparate = glStencilFuncSeparate;
+ interface->fStencilMask = glStencilMask;
+ interface->fStencilMaskSeparate = glStencilMaskSeparate;
+ interface->fStencilOp = glStencilOp;
+ interface->fStencilOpSeparate = glStencilOpSeparate;
+ interface->fTexImage2D = glTexImage2D;
+ interface->fTexParameteri = glTexParameteri;
+ interface->fTexSubImage2D = glTexSubImage2D;
+ interface->fUniform1f = glUniform1f;
+ interface->fUniform1i = glUniform1i;
+ interface->fUniform1fv = glUniform1fv;
+ interface->fUniform1iv = glUniform1iv;
+ interface->fUniform2f = glUniform2f;
+ interface->fUniform2i = glUniform2i;
+ interface->fUniform2fv = glUniform2fv;
+ interface->fUniform2iv = glUniform2iv;
+ interface->fUniform3f = glUniform3f;
+ interface->fUniform3i = glUniform3i;
+ interface->fUniform3fv = glUniform3fv;
+ interface->fUniform3iv = glUniform3iv;
+ interface->fUniform4f = glUniform4f;
+ interface->fUniform4i = glUniform4i;
+ interface->fUniform4fv = glUniform4fv;
+ interface->fUniform4iv = glUniform4iv;
+ interface->fUniformMatrix2fv = glUniformMatrix2fv;
+ interface->fUniformMatrix3fv = glUniformMatrix3fv;
+ interface->fUniformMatrix4fv = glUniformMatrix4fv;
+ interface->fUseProgram = glUseProgram;
+ interface->fVertexAttrib4fv = glVertexAttrib4fv;
+ interface->fVertexAttribPointer = glVertexAttribPointer;
+ interface->fViewport = glViewport;
+ interface->fBindFramebuffer = glBindFramebuffer;
+ interface->fBindRenderbuffer = glBindRenderbuffer;
+ interface->fCheckFramebufferStatus = glCheckFramebufferStatus;
+ interface->fDeleteFramebuffers = glDeleteFramebuffers;
+ interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
+ interface->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
+ interface->fFramebufferTexture2D = glFramebufferTexture2D;
+ interface->fGenFramebuffers = glGenFramebuffers;
+ interface->fGenRenderbuffers = glGenRenderbuffers;
+ interface->fGetFramebufferAttachmentParameteriv =
glGetFramebufferAttachmentParameteriv;
- gl_interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
- gl_interface->fRenderbufferStorage = glRenderbufferStorage;
- gl_interface->fRenderbufferStorageMultisample =
+ interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
+ interface->fRenderbufferStorage = glRenderbufferStorage;
+ interface->fRenderbufferStorageMultisample =
glRenderbufferStorageMultisampleEXT;
- gl_interface->fBlitFramebuffer = glBlitFramebufferEXT;
- return gl_interface;
+ interface->fBlitFramebuffer = glBlitFramebufferEXT;
+ return interface;
}
} // namespace webkit_glue
generated by cgit v1.1 at 2025-02-09 23:12:30 +0000