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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/webgraphicscontext3d_command_buffer_impl.h

Issue 6350016: Refactor WebGraphicsContext3D to use WGC3D types which match corresponding GL... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: This is the ugly but safe and correct way Created 9 years, 11 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 | « no previous file | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc » ('j') | webkit/gpu/webgraphicscontext3d_in_process_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
===================================================================
--- chrome/renderer/webgraphicscontext3d_command_buffer_impl.h (revision 72509)
+++ chrome/renderer/webgraphicscontext3d_command_buffer_impl.h (working copy)
@@ -30,8 +30,21 @@
}
}
+using WebKit::WGC3Dchar;
+using WebKit::WGC3Denum;
+using WebKit::WGC3Dboolean;
+using WebKit::WGC3Dbitfield;
+using WebKit::WGC3Dint;
+using WebKit::WGC3Dsizei;
+using WebKit::WGC3Duint;
+using WebKit::WGC3Dfloat;
+using WebKit::WGC3Dclampf;
+using WebKit::WGC3Dintptr;
+using WebKit::WGC3Dsizeiptr;
Ken Russell (switch to Gerrit) 2011/01/26 23:58:02 I think this block should go inside the #if define
using WebKit::WebGLId;
+#if defined(USE_WGC3D_TYPES)
+
class WebGraphicsContext3DCommandBufferImpl
: public WebKit::WebGraphicsContext3D {
public:
@@ -50,6 +63,407 @@
virtual int width();
virtual int height();
+ virtual bool isGLES2Compliant();
+
+ virtual void reshape(int width, int height);
+
+ virtual bool readBackFramebuffer(unsigned char* pixels, size_t buffer_size);
+
+ virtual WebGLId getPlatformTextureId();
+ virtual void prepareTexture();
+
+ virtual void activeTexture(WGC3Denum texture);
+ virtual void attachShader(WebGLId program, WebGLId shader);
+ virtual void bindAttribLocation(WebGLId program, WGC3Duint index,
+ const WGC3Dchar* name);
+ virtual void bindBuffer(WGC3Denum target, WebGLId buffer);
+ virtual void bindFramebuffer(WGC3Denum target, WebGLId framebuffer);
+ virtual void bindRenderbuffer(WGC3Denum target, WebGLId renderbuffer);
+ virtual void bindTexture(WGC3Denum target, WebGLId texture);
+ virtual void blendColor(WGC3Dclampf red, WGC3Dclampf green,
+ WGC3Dclampf blue, WGC3Dclampf alpha);
+ virtual void blendEquation(WGC3Denum mode);
+ virtual void blendEquationSeparate(WGC3Denum modeRGB,
+ WGC3Denum modeAlpha);
+ virtual void blendFunc(WGC3Denum sfactor, WGC3Denum dfactor);
+ virtual void blendFuncSeparate(WGC3Denum srcRGB,
+ WGC3Denum dstRGB,
+ WGC3Denum srcAlpha,
+ WGC3Denum dstAlpha);
+
+ virtual void bufferData(WGC3Denum target, WGC3Dsizeiptr size,
+ const void* data, WGC3Denum usage);
+ virtual void bufferSubData(WGC3Denum target, WGC3Dintptr offset,
+ WGC3Dsizeiptr size, const void* data);
+
+ virtual WGC3Denum checkFramebufferStatus(WGC3Denum target);
+ virtual void clear(WGC3Dbitfield mask);
+ virtual void clearColor(WGC3Dclampf red, WGC3Dclampf green,
+ WGC3Dclampf blue, WGC3Dclampf alpha);
+ virtual void clearDepth(WGC3Dclampf depth);
+ virtual void clearStencil(WGC3Dint s);
+ virtual void colorMask(WGC3Dboolean red, WGC3Dboolean green,
+ WGC3Dboolean blue, WGC3Dboolean alpha);
+ virtual void compileShader(WebGLId shader);
+
+ virtual void copyTexImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Denum internalformat,
+ WGC3Dint x,
+ WGC3Dint y,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Dint border);
+ virtual void copyTexSubImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Dint xoffset,
+ WGC3Dint yoffset,
+ WGC3Dint x,
+ WGC3Dint y,
+ WGC3Dsizei width,
+ WGC3Dsizei height);
+ virtual void cullFace(WGC3Denum mode);
+ virtual void depthFunc(WGC3Denum func);
+ virtual void depthMask(WGC3Dboolean flag);
+ virtual void depthRange(WGC3Dclampf zNear, WGC3Dclampf zFar);
+ virtual void detachShader(WebGLId program, WebGLId shader);
+ virtual void disable(WGC3Denum cap);
+ virtual void disableVertexAttribArray(WGC3Duint index);
+ virtual void drawArrays(WGC3Denum mode, WGC3Dint first, WGC3Dsizei count);
+ virtual void drawElements(WGC3Denum mode,
+ WGC3Dsizei count,
+ WGC3Denum type,
+ WGC3Dintptr offset);
+
+ virtual void enable(WGC3Denum cap);
+ virtual void enableVertexAttribArray(WGC3Duint index);
+ virtual void finish();
+ virtual void flush();
+ virtual void framebufferRenderbuffer(WGC3Denum target,
+ WGC3Denum attachment,
+ WGC3Denum renderbuffertarget,
+ WebGLId renderbuffer);
+ virtual void framebufferTexture2D(WGC3Denum target,
+ WGC3Denum attachment,
+ WGC3Denum textarget,
+ WebGLId texture,
+ WGC3Dint level);
+ virtual void frontFace(WGC3Denum mode);
+ virtual void generateMipmap(WGC3Denum target);
+
+ virtual bool getActiveAttrib(WebGLId program,
+ WGC3Duint index,
+ ActiveInfo&);
+ virtual bool getActiveUniform(WebGLId program,
+ WGC3Duint index,
+ ActiveInfo&);
+
+ virtual void getAttachedShaders(WebGLId program,
+ WGC3Dsizei maxCount,
+ WGC3Dsizei* count,
+ WebGLId* shaders);
+
+ virtual WGC3Dint getAttribLocation(WebGLId program, const WGC3Dchar* name);
+
+ virtual void getBooleanv(WGC3Denum pname, WGC3Dboolean* value);
+
+ virtual void getBufferParameteriv(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dint* value);
+
+ virtual Attributes getContextAttributes();
+
+ virtual WGC3Denum getError();
+
+ virtual bool isContextLost();
+
+ virtual void getFloatv(WGC3Denum pname, WGC3Dfloat* value);
+
+ virtual void getFramebufferAttachmentParameteriv(WGC3Denum target,
+ WGC3Denum attachment,
+ WGC3Denum pname,
+ WGC3Dint* value);
+
+ virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value);
+
+ virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value);
+
+ virtual WebKit::WebString getProgramInfoLog(WebGLId program);
+
+ virtual void getRenderbufferParameteriv(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dint* value);
+
+ virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value);
+
+ virtual WebKit::WebString getShaderInfoLog(WebGLId shader);
+
+ // TBD
+ // void glGetShaderPrecisionFormat (GLenum shadertype,
+ // GLenum precisiontype,
+ // GLint* range,
+ // GLint* precision);
+
+ virtual WebKit::WebString getShaderSource(WebGLId shader);
+ virtual WebKit::WebString getString(WGC3Denum name);
+
+ virtual void getTexParameterfv(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dfloat* value);
+ virtual void getTexParameteriv(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dint* value);
+
+ virtual void getUniformfv(WebGLId program,
+ WGC3Dint location,
+ WGC3Dfloat* value);
+ virtual void getUniformiv(WebGLId program,
+ WGC3Dint location,
+ WGC3Dint* value);
+
+ virtual WGC3Dint getUniformLocation(WebGLId program, const WGC3Dchar* name);
+
+ virtual void getVertexAttribfv(WGC3Duint index, WGC3Denum pname,
+ WGC3Dfloat* value);
+ virtual void getVertexAttribiv(WGC3Duint index, WGC3Denum pname,
+ WGC3Dint* value);
+
+ virtual WGC3Dsizeiptr getVertexAttribOffset(WGC3Duint index, WGC3Denum pname);
+
+ virtual void hint(WGC3Denum target, WGC3Denum mode);
+ virtual WGC3Dboolean isBuffer(WebGLId buffer);
+ virtual WGC3Dboolean isEnabled(WGC3Denum cap);
+ virtual WGC3Dboolean isFramebuffer(WebGLId framebuffer);
+ virtual WGC3Dboolean isProgram(WebGLId program);
+ virtual WGC3Dboolean isRenderbuffer(WebGLId renderbuffer);
+ virtual WGC3Dboolean isShader(WebGLId shader);
+ virtual WGC3Dboolean isTexture(WebGLId texture);
+ virtual void lineWidth(WGC3Dfloat);
+ virtual void linkProgram(WebGLId program);
+ virtual void pixelStorei(WGC3Denum pname, WGC3Dint param);
+ virtual void polygonOffset(WGC3Dfloat factor, WGC3Dfloat units);
+
+ virtual void readPixels(WGC3Dint x,
+ WGC3Dint y,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Denum format,
+ WGC3Denum type,
+ void* pixels);
+
+ virtual void releaseShaderCompiler();
+ virtual void renderbufferStorage(WGC3Denum target,
+ WGC3Denum internalformat,
+ WGC3Dsizei width,
+ WGC3Dsizei height);
+ virtual void sampleCoverage(WGC3Dfloat value, WGC3Dboolean invert);
+ virtual void scissor(WGC3Dint x, WGC3Dint y,
+ WGC3Dsizei width, WGC3Dsizei height);
+ virtual void shaderSource(WebGLId shader, const WGC3Dchar* string);
+ virtual void stencilFunc(WGC3Denum func, WGC3Dint ref, WGC3Duint mask);
+ virtual void stencilFuncSeparate(WGC3Denum face,
+ WGC3Denum func,
+ WGC3Dint ref,
+ WGC3Duint mask);
+ virtual void stencilMask(WGC3Duint mask);
+ virtual void stencilMaskSeparate(WGC3Denum face, WGC3Duint mask);
+ virtual void stencilOp(WGC3Denum fail,
+ WGC3Denum zfail,
+ WGC3Denum zpass);
+ virtual void stencilOpSeparate(WGC3Denum face,
+ WGC3Denum fail,
+ WGC3Denum zfail,
+ WGC3Denum zpass);
+
+ virtual void texImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Denum internalformat,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Dint border,
+ WGC3Denum format,
+ WGC3Denum type,
+ const void* pixels);
+
+ virtual void texParameterf(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dfloat param);
+ virtual void texParameteri(WGC3Denum target,
+ WGC3Denum pname,
+ WGC3Dint param);
+
+ virtual void texSubImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Dint xoffset,
+ WGC3Dint yoffset,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Denum format,
+ WGC3Denum type,
+ const void* pixels);
+
+ virtual void uniform1f(WGC3Dint location, WGC3Dfloat x);
+ virtual void uniform1fv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dfloat* v);
+ virtual void uniform1i(WGC3Dint location, WGC3Dint x);
+ virtual void uniform1iv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dint* v);
+ virtual void uniform2f(WGC3Dint location, WGC3Dfloat x, WGC3Dfloat y);
+ virtual void uniform2fv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dfloat* v);
+ virtual void uniform2i(WGC3Dint location, WGC3Dint x, WGC3Dint y);
+ virtual void uniform2iv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dint* v);
+ virtual void uniform3f(WGC3Dint location,
+ WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z);
+ virtual void uniform3fv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dfloat* v);
+ virtual void uniform3i(WGC3Dint location,
+ WGC3Dint x, WGC3Dint y, WGC3Dint z);
+ virtual void uniform3iv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dint* v);
+ virtual void uniform4f(WGC3Dint location,
+ WGC3Dfloat x, WGC3Dfloat y,
+ WGC3Dfloat z, WGC3Dfloat w);
+ virtual void uniform4fv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dfloat* v);
+ virtual void uniform4i(WGC3Dint location,
+ WGC3Dint x, WGC3Dint y, WGC3Dint z, WGC3Dint w);
+ virtual void uniform4iv(WGC3Dint location,
+ WGC3Dsizei count, const WGC3Dint* v);
+ virtual void uniformMatrix2fv(WGC3Dint location,
+ WGC3Dsizei count,
+ WGC3Dboolean transpose,
+ const WGC3Dfloat* value);
+ virtual void uniformMatrix3fv(WGC3Dint location,
+ WGC3Dsizei count,
+ WGC3Dboolean transpose,
+ const WGC3Dfloat* value);
+ virtual void uniformMatrix4fv(WGC3Dint location,
+ WGC3Dsizei count,
+ WGC3Dboolean transpose,
+ const WGC3Dfloat* value);
+
+ virtual void useProgram(WebGLId program);
+ virtual void validateProgram(WebGLId program);
+
+ virtual void vertexAttrib1f(WGC3Duint index, WGC3Dfloat x);
+ virtual void vertexAttrib1fv(WGC3Duint index, const WGC3Dfloat* values);
+ virtual void vertexAttrib2f(WGC3Duint index, WGC3Dfloat x, WGC3Dfloat y);
+ virtual void vertexAttrib2fv(WGC3Duint index, const WGC3Dfloat* values);
+ virtual void vertexAttrib3f(WGC3Duint index,
+ WGC3Dfloat x, WGC3Dfloat y, WGC3Dfloat z);
+ virtual void vertexAttrib3fv(WGC3Duint index, const WGC3Dfloat* values);
+ virtual void vertexAttrib4f(WGC3Duint index,
+ WGC3Dfloat x, WGC3Dfloat y,
+ WGC3Dfloat z, WGC3Dfloat w);
+ virtual void vertexAttrib4fv(WGC3Duint index, const WGC3Dfloat* values);
+ virtual void vertexAttribPointer(WGC3Duint index,
+ WGC3Dint size,
+ WGC3Denum type,
+ WGC3Dboolean normalized,
+ WGC3Dsizei stride,
+ WGC3Dintptr offset);
+
+ virtual void viewport(WGC3Dint x, WGC3Dint y,
+ WGC3Dsizei width, WGC3Dsizei height);
+
+ // Support for buffer creation and deletion
+ virtual WebGLId createBuffer();
+ virtual WebGLId createFramebuffer();
+ virtual WebGLId createProgram();
+ virtual WebGLId createRenderbuffer();
+ virtual WebGLId createShader(WGC3Denum);
+ virtual WebGLId createTexture();
+
+ virtual void deleteBuffer(WebGLId);
+ virtual void deleteFramebuffer(WebGLId);
+ virtual void deleteProgram(WebGLId);
+ virtual void deleteRenderbuffer(WebGLId);
+ virtual void deleteShader(WebGLId);
+ virtual void deleteTexture(WebGLId);
+
+ virtual void synthesizeGLError(WGC3Denum);
+
+ virtual void* mapBufferSubDataCHROMIUM(
+ WGC3Denum target, WGC3Dintptr offset,
+ WGC3Dsizeiptr size, WGC3Denum access);
+ virtual void unmapBufferSubDataCHROMIUM(const void*);
+ virtual void* mapTexSubImage2DCHROMIUM(
+ WGC3Denum target,
+ WGC3Dint level,
+ WGC3Dint xoffset,
+ WGC3Dint yoffset,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Denum format,
+ WGC3Denum type,
+ WGC3Denum access);
+ virtual void unmapTexSubImage2DCHROMIUM(const void*);
+
+ virtual void copyTextureToParentTextureCHROMIUM(
+ WebGLId texture, WebGLId parentTexture);
+
+ virtual WebKit::WebString getRequestableExtensionsCHROMIUM();
+ virtual void requestExtensionCHROMIUM(const char*);
+
+ virtual WebGLId createCompositorTexture(WGC3Dsizei width, WGC3Dsizei height);
+ virtual void deleteCompositorTexture(WebGLId parent_texture);
+ virtual void copyTextureToCompositor(WebGLId texture,
+ WebGLId parent_texture);
+
+ ggl::Context* context() { return context_; }
+
+ private:
+ // SwapBuffers callback;
+ void OnSwapBuffers();
+
+ // The GGL context we use for OpenGL rendering.
+ ggl::Context* context_;
+ // If rendering directly to WebView, weak pointer to it.
+ WebKit::WebView* web_view_;
+#if defined(OS_MACOSX)
+ // "Fake" plugin window handle in browser process for the compositor's output.
+ gfx::PluginWindowHandle plugin_handle_;
+#endif
+
+ WebKit::WebGraphicsContext3D::Attributes attributes_;
+ int cached_width_, cached_height_;
+
+ // For tracking which FBO is bound.
+ WebGLId bound_fbo_;
+
+ // Errors raised by synthesizeGLError().
+ std::vector<WGC3Denum> synthetic_errors_;
+
+#ifdef FLIP_FRAMEBUFFER_VERTICALLY
+ scoped_ptr<uint8> scanline_;
+ void FlipVertically(uint8* framebuffer,
+ unsigned int width,
+ unsigned int height);
+#endif
+};
+
+#else // USE_WGC3D_TYPES
+
+class WebGraphicsContext3DCommandBufferImpl
+ : public WebKit::WebGraphicsContext3D {
+ public:
+
+ WebGraphicsContext3DCommandBufferImpl();
+ virtual ~WebGraphicsContext3DCommandBufferImpl();
+
+ //----------------------------------------------------------------------
+ // WebGraphicsContext3D methods
+ virtual bool initialize(WebGraphicsContext3D::Attributes attributes,
+ WebKit::WebView*,
+ bool renderDirectlyToWebView);
+
+ virtual bool makeContextCurrent();
+
+ virtual int width();
+ virtual int height();
+
virtual int sizeInBytes(int type);
virtual bool isGLES2Compliant();
@@ -401,6 +815,8 @@
#endif
};
+#endif // USE_WGC3D_TYPES
+
#endif // defined(ENABLE_GPU)
#endif // CHROME_RENDERER_WEBGRAPHICSCONTEXT3D_COMMAND_BUFFER_IMPL_H_
« no previous file with comments | « no previous file | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc » ('j') | webkit/gpu/webgraphicscontext3d_in_process_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698