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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gl/gl_bindings_skia_in_process.cc

Issue 7756004: Create a new GrGLInterface for each GrContext so callback can be used to set GL-context (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: switch machines Created 9 years, 4 months 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 | « ui/gfx/gl/gl_bindings_skia_in_process.h ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl_bindings_skia_in_process.cc
===================================================================
--- ui/gfx/gl/gl_bindings_skia_in_process.cc (revision 99359)
+++ ui/gfx/gl/gl_bindings_skia_in_process.cc (working copy)
@@ -469,140 +469,136 @@
namespace gfx {
-GrGLInterface* GetInProcessSkiaGLBinding() {
- static SkAutoTUnref<GrGLInterface> host_gl_interface;
- if (NULL == host_gl_interface.get()) {
- GrGLBinding binding;
- switch (gfx::GetGLImplementation()) {
- case gfx::kGLImplementationNone:
- NOTREACHED();
- return NULL;
- case gfx::kGLImplementationDesktopGL:
- binding = kDesktop_GrGLBinding;
- break;
- case gfx::kGLImplementationOSMesaGL:
- binding = kDesktop_GrGLBinding;
- break;
- case gfx::kGLImplementationEGLGLES2:
- binding = kES2_GrGLBinding;
- break;
- case gfx::kGLImplementationMockGL:
- NOTREACHED();
- return NULL;
- default:
- NOTREACHED();
- return NULL;
- }
+GrGLInterface* CreateInProcessSkiaGLBinding() {
+ GrGLBinding binding;
+ switch (gfx::GetGLImplementation()) {
+ case gfx::kGLImplementationNone:
+ NOTREACHED();
+ return NULL;
+ case gfx::kGLImplementationDesktopGL:
+ binding = kDesktop_GrGLBinding;
+ break;
+ case gfx::kGLImplementationOSMesaGL:
+ binding = kDesktop_GrGLBinding;
+ break;
+ case gfx::kGLImplementationEGLGLES2:
+ binding = kES2_GrGLBinding;
+ break;
+ case gfx::kGLImplementationMockGL:
+ NOTREACHED();
+ return NULL;
+ default:
+ NOTREACHED();
+ return NULL;
+ }
- GrGLInterface* interface = new GrGLInterface;
- host_gl_interface.reset(interface);
+ GrGLInterface* interface = new GrGLInterface;
- interface->fBindingsExported = binding;
- interface->fActiveTexture = StubGLActiveTexture;
- interface->fAttachShader = StubGLAttachShader;
- interface->fBindAttribLocation = StubGLBindAttribLocation;
- interface->fBindBuffer = StubGLBindBuffer;
- interface->fBindTexture = StubGLBindTexture;
- interface->fBlendColor = StubGLBlendColor;
- interface->fBlendFunc = StubGLBlendFunc;
- interface->fBufferData = StubGLBufferData;
- interface->fBufferSubData = StubGLBufferSubData;
- interface->fClear = StubGLClear;
- interface->fClearColor = StubGLClearColor;
- interface->fClearStencil = StubGLClearStencil;
- interface->fColorMask = StubGLColorMask;
- interface->fCompileShader = StubGLCompileShader;
- interface->fCompressedTexImage2D = StubGLCompressedTexImage2D;
- interface->fCreateProgram = StubGLCreateProgram;
- interface->fCreateShader = StubGLCreateShader;
- interface->fCullFace = StubGLCullFace;
- interface->fDeleteBuffers = StubGLDeleteBuffers;
- interface->fDeleteProgram = StubGLDeleteProgram;
- interface->fDeleteShader = StubGLDeleteShader;
- interface->fDeleteTextures = StubGLDeleteTextures;
- interface->fDepthMask = StubGLDepthMask;
- interface->fDisable = StubGLDisable;
- interface->fDisableVertexAttribArray = StubGLDisableVertexAttribArray;
- interface->fDrawArrays = StubGLDrawArrays;
- interface->fDrawBuffer = StubGLDrawBuffer;
- interface->fDrawBuffers = StubGLDrawBuffers;
- interface->fDrawElements = StubGLDrawElements;
- interface->fEnable = StubGLEnable;
- interface->fEnableVertexAttribArray = StubGLEnableVertexAttribArray;
- interface->fFrontFace = StubGLFrontFace;
- interface->fGenBuffers = StubGLGenBuffers;
- interface->fGenTextures = StubGLGenTextures;
- interface->fGetBufferParameteriv = StubGLGetBufferParameteriv;
- interface->fGetError = StubGLGetError;
- interface->fGetIntegerv = StubGLGetIntegerv;
- interface->fGetProgramInfoLog = StubGLGetProgramInfoLog;
- interface->fGetProgramiv = StubGLGetProgramiv;
- interface->fGetShaderInfoLog = StubGLGetShaderInfoLog;
- interface->fGetShaderiv = StubGLGetShaderiv;
- interface->fGetString = StubGLGetString;
- interface->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv;
- interface->fGetUniformLocation = StubGLGetUniformLocation;
- interface->fLineWidth = StubGLLineWidth;
- interface->fLinkProgram = StubGLLinkProgram;
- interface->fPixelStorei = StubGLPixelStorei;
- interface->fReadBuffer = StubGLReadBuffer;
- interface->fReadPixels = StubGLReadPixels;
- interface->fScissor = StubGLScissor;
- interface->fShaderSource = StubGLShaderSource;
- interface->fStencilFunc = StubGLStencilFunc;
- interface->fStencilFuncSeparate = StubGLStencilFuncSeparate;
- interface->fStencilMask = StubGLStencilMask;
- interface->fStencilMaskSeparate = StubGLStencilMaskSeparate;
- interface->fStencilOp = StubGLStencilOp;
- interface->fStencilOpSeparate = StubGLStencilOpSeparate;
- interface->fTexImage2D = StubGLTexImage2D;
- interface->fTexParameteri = StubGLTexParameteri;
- interface->fTexSubImage2D = StubGLTexSubImage2D;
- interface->fUniform1f = StubGLUniform1f;
- interface->fUniform1i = StubGLUniform1i;
- interface->fUniform1fv = StubGLUniform1fv;
- interface->fUniform1iv = StubGLUniform1iv;
- interface->fUniform2f = StubGLUniform2f;
- interface->fUniform2i = StubGLUniform2i;
- interface->fUniform2fv = StubGLUniform2fv;
- interface->fUniform2iv = StubGLUniform2iv;
- interface->fUniform3f = StubGLUniform3f;
- interface->fUniform3i = StubGLUniform3i;
- interface->fUniform3fv = StubGLUniform3fv;
- interface->fUniform3iv = StubGLUniform3iv;
- interface->fUniform4f = StubGLUniform4f;
- interface->fUniform4i = StubGLUniform4i;
- interface->fUniform4fv = StubGLUniform4fv;
- interface->fUniform4iv = StubGLUniform4iv;
- interface->fUniformMatrix2fv = StubGLUniformMatrix2fv;
- interface->fUniformMatrix3fv = StubGLUniformMatrix3fv;
- interface->fUniformMatrix4fv = StubGLUniformMatrix4fv;
- interface->fUseProgram = StubGLUseProgram;
- interface->fVertexAttrib4fv = StubGLVertexAttrib4fv;
- interface->fVertexAttribPointer = StubGLVertexAttribPointer;
- interface->fViewport = StubGLViewport;
- interface->fBindFramebuffer = StubGLBindFramebuffer;
- interface->fBindRenderbuffer = StubGLBindRenderbuffer;
- interface->fCheckFramebufferStatus = StubGLCheckFramebufferStatus;
- interface->fDeleteFramebuffers = StubGLDeleteFramebuffers;
- interface->fDeleteRenderbuffers = StubGLDeleteRenderbuffers;
- interface->fFramebufferRenderbuffer = StubGLFramebufferRenderbuffer;
- interface->fFramebufferTexture2D = StubGLFramebufferTexture2D;
- interface->fGenFramebuffers = StubGLGenFramebuffers;
- interface->fGenRenderbuffers = StubGLGenRenderbuffers;
- interface->fGetFramebufferAttachmentParameteriv =
- StubGLGetFramebufferAttachmentParameteriv;
- interface->fGetRenderbufferParameteriv = StubGLGetRenderbufferParameteriv;
- interface->fRenderbufferStorage = StubGLRenderbufferStorage;
- interface->fRenderbufferStorageMultisample =
- StubGLRenderbufferStorageMultisample;
- interface->fBlitFramebuffer = StubGLBlitFramebuffer;
- interface->fMapBuffer = StubGLMapBuffer;
- interface->fUnmapBuffer = StubGLUnmapBuffer;
- interface->fBindFragDataLocationIndexed =
- StubBindFragDataLocationIndexedARB;
- }
- return host_gl_interface.get();
+ interface->fBindingsExported = binding;
+ interface->fActiveTexture = StubGLActiveTexture;
+ interface->fAttachShader = StubGLAttachShader;
+ interface->fBindAttribLocation = StubGLBindAttribLocation;
+ interface->fBindBuffer = StubGLBindBuffer;
+ interface->fBindTexture = StubGLBindTexture;
+ interface->fBlendColor = StubGLBlendColor;
+ interface->fBlendFunc = StubGLBlendFunc;
+ interface->fBufferData = StubGLBufferData;
+ interface->fBufferSubData = StubGLBufferSubData;
+ interface->fClear = StubGLClear;
+ interface->fClearColor = StubGLClearColor;
+ interface->fClearStencil = StubGLClearStencil;
+ interface->fColorMask = StubGLColorMask;
+ interface->fCompileShader = StubGLCompileShader;
+ interface->fCompressedTexImage2D = StubGLCompressedTexImage2D;
+ interface->fCreateProgram = StubGLCreateProgram;
+ interface->fCreateShader = StubGLCreateShader;
+ interface->fCullFace = StubGLCullFace;
+ interface->fDeleteBuffers = StubGLDeleteBuffers;
+ interface->fDeleteProgram = StubGLDeleteProgram;
+ interface->fDeleteShader = StubGLDeleteShader;
+ interface->fDeleteTextures = StubGLDeleteTextures;
+ interface->fDepthMask = StubGLDepthMask;
+ interface->fDisable = StubGLDisable;
+ interface->fDisableVertexAttribArray = StubGLDisableVertexAttribArray;
+ interface->fDrawArrays = StubGLDrawArrays;
+ interface->fDrawBuffer = StubGLDrawBuffer;
+ interface->fDrawBuffers = StubGLDrawBuffers;
+ interface->fDrawElements = StubGLDrawElements;
+ interface->fEnable = StubGLEnable;
+ interface->fEnableVertexAttribArray = StubGLEnableVertexAttribArray;
+ interface->fFrontFace = StubGLFrontFace;
+ interface->fGenBuffers = StubGLGenBuffers;
+ interface->fGenTextures = StubGLGenTextures;
+ interface->fGetBufferParameteriv = StubGLGetBufferParameteriv;
+ interface->fGetError = StubGLGetError;
+ interface->fGetIntegerv = StubGLGetIntegerv;
+ interface->fGetProgramInfoLog = StubGLGetProgramInfoLog;
+ interface->fGetProgramiv = StubGLGetProgramiv;
+ interface->fGetShaderInfoLog = StubGLGetShaderInfoLog;
+ interface->fGetShaderiv = StubGLGetShaderiv;
+ interface->fGetString = StubGLGetString;
+ interface->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv;
+ interface->fGetUniformLocation = StubGLGetUniformLocation;
+ interface->fLineWidth = StubGLLineWidth;
+ interface->fLinkProgram = StubGLLinkProgram;
+ interface->fPixelStorei = StubGLPixelStorei;
+ interface->fReadBuffer = StubGLReadBuffer;
+ interface->fReadPixels = StubGLReadPixels;
+ interface->fScissor = StubGLScissor;
+ interface->fShaderSource = StubGLShaderSource;
+ interface->fStencilFunc = StubGLStencilFunc;
+ interface->fStencilFuncSeparate = StubGLStencilFuncSeparate;
+ interface->fStencilMask = StubGLStencilMask;
+ interface->fStencilMaskSeparate = StubGLStencilMaskSeparate;
+ interface->fStencilOp = StubGLStencilOp;
+ interface->fStencilOpSeparate = StubGLStencilOpSeparate;
+ interface->fTexImage2D = StubGLTexImage2D;
+ interface->fTexParameteri = StubGLTexParameteri;
+ interface->fTexSubImage2D = StubGLTexSubImage2D;
+ interface->fUniform1f = StubGLUniform1f;
+ interface->fUniform1i = StubGLUniform1i;
+ interface->fUniform1fv = StubGLUniform1fv;
+ interface->fUniform1iv = StubGLUniform1iv;
+ interface->fUniform2f = StubGLUniform2f;
+ interface->fUniform2i = StubGLUniform2i;
+ interface->fUniform2fv = StubGLUniform2fv;
+ interface->fUniform2iv = StubGLUniform2iv;
+ interface->fUniform3f = StubGLUniform3f;
+ interface->fUniform3i = StubGLUniform3i;
+ interface->fUniform3fv = StubGLUniform3fv;
+ interface->fUniform3iv = StubGLUniform3iv;
+ interface->fUniform4f = StubGLUniform4f;
+ interface->fUniform4i = StubGLUniform4i;
+ interface->fUniform4fv = StubGLUniform4fv;
+ interface->fUniform4iv = StubGLUniform4iv;
+ interface->fUniformMatrix2fv = StubGLUniformMatrix2fv;
+ interface->fUniformMatrix3fv = StubGLUniformMatrix3fv;
+ interface->fUniformMatrix4fv = StubGLUniformMatrix4fv;
+ interface->fUseProgram = StubGLUseProgram;
+ interface->fVertexAttrib4fv = StubGLVertexAttrib4fv;
+ interface->fVertexAttribPointer = StubGLVertexAttribPointer;
+ interface->fViewport = StubGLViewport;
+ interface->fBindFramebuffer = StubGLBindFramebuffer;
+ interface->fBindRenderbuffer = StubGLBindRenderbuffer;
+ interface->fCheckFramebufferStatus = StubGLCheckFramebufferStatus;
+ interface->fDeleteFramebuffers = StubGLDeleteFramebuffers;
+ interface->fDeleteRenderbuffers = StubGLDeleteRenderbuffers;
+ interface->fFramebufferRenderbuffer = StubGLFramebufferRenderbuffer;
+ interface->fFramebufferTexture2D = StubGLFramebufferTexture2D;
+ interface->fGenFramebuffers = StubGLGenFramebuffers;
+ interface->fGenRenderbuffers = StubGLGenRenderbuffers;
+ interface->fGetFramebufferAttachmentParameteriv =
+ StubGLGetFramebufferAttachmentParameteriv;
+ interface->fGetRenderbufferParameteriv = StubGLGetRenderbufferParameteriv;
+ interface->fRenderbufferStorage = StubGLRenderbufferStorage;
+ interface->fRenderbufferStorageMultisample =
+ StubGLRenderbufferStorageMultisample;
+ interface->fBlitFramebuffer = StubGLBlitFramebuffer;
+ interface->fMapBuffer = StubGLMapBuffer;
+ interface->fUnmapBuffer = StubGLUnmapBuffer;
+ interface->fBindFragDataLocationIndexed =
+ StubBindFragDataLocationIndexedARB;
+ return interface;
}
} // namespace gfx
« no previous file with comments | « ui/gfx/gl/gl_bindings_skia_in_process.h ('k') | webkit/glue/gl_bindings_skia_cmd_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698