Add multiple color buffer attachments points to gl::Framebuffer.

Also addded the checks for framebuffer completeness as defined by the ES2 spec and EXT_draw_buffers. TRAC #22656 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2065 736b8ea6-26fd-11df-bfd4-992fa37f6226

Add multiple color buffer attachments points to gl::Framebuffer.
f30ccc2f · shannon.woods%transgaming.com@gtempaccount.com · 3b57b4fc · f30ccc2f · f30ccc2f · f30ccc2f
Commit f30ccc2f authored Apr 13, 2013 by shannon.woods%transgaming.com@gtempaccount.com
Showing with 19 additions and 3 deletions

Framebuffer.cpp src/libGLESv2/Framebuffer.cpp +0 -0

Framebuffer.h src/libGLESv2/Framebuffer.h +14 -2

constants.h src/libGLESv2/constants.h +2 -1

Renderer11.cpp src/libGLESv2/renderer/Renderer11.cpp +3 -0

No files found.
--- a/src/libGLESv2/Framebuffer.cpp
+++ b/src/libGLESv2/Framebuffer.cpp
--- a/src/libGLESv2/Framebuffer.h
+++ b/src/libGLESv2/Framebuffer.h
@@ -34,6 +34,7 @@ class Framebuffer

    virtual ~Framebuffer();

+    void setColorbuffer(unsigned int colorAttachment, GLenum type, GLuint colorbuffer);
    void setColorbuffer(GLenum type, GLuint colorbuffer);
    void setDepthbuffer(GLenum type, GLuint depthbuffer);
    void setStencilbuffer(GLenum type, GLuint stencilbuffer);
@@ -41,31 +42,42 @@ class Framebuffer
    void detachTexture(GLuint texture);
    void detachRenderbuffer(GLuint renderbuffer);

+    unsigned int getRenderTargetSerial(unsigned int colorAttachment) const;
    unsigned int getRenderTargetSerial() const;
    unsigned int getDepthbufferSerial() const;
    unsigned int getStencilbufferSerial() const;

+    Renderbuffer *getColorbuffer(unsigned int colorAttachment) const;
    Renderbuffer *getColorbuffer() const;
    Renderbuffer *getDepthbuffer() const;
    Renderbuffer *getStencilbuffer() const;
    Renderbuffer *getDepthOrStencilbuffer() const;
+    Renderbuffer *getReadColorbuffer() const;
+    Renderbuffer *getFirstColorBuffer() const;

+    GLenum getColorbufferType(unsigned int colorAttachment) const;
    GLenum getColorbufferType() const;
    GLenum getDepthbufferType() const;
    GLenum getStencilbufferType() const;

+    GLuint getColorbufferHandle(unsigned int colorAttachment) const;
    GLuint getColorbufferHandle() const;
    GLuint getDepthbufferHandle() const;
    GLuint getStencilbufferHandle() const;

+    GLenum getDrawBufferState(unsigned int colorAttachment) const;
+    void setDrawBufferState(unsigned int colorAttachment, GLenum drawBuffer);
+
    bool hasStencil() const;
    int getSamples() const;

    virtual GLenum completeness() const;

  protected:
-    GLenum mColorbufferType;
-    BindingPointer<Renderbuffer> mColorbufferPointer;
+    GLenum mColorbufferTypes[IMPLEMENTATION_MAX_DRAW_BUFFERS];
+    BindingPointer<Renderbuffer> mColorbufferPointers[IMPLEMENTATION_MAX_DRAW_BUFFERS];
+    GLenum mDrawBufferStates[IMPLEMENTATION_MAX_DRAW_BUFFERS];
+    GLenum mReadBufferState;

    GLenum mDepthbufferType;
    BindingPointer<Renderbuffer> mDepthbufferPointer;

--- a/src/libGLESv2/constants.h
+++ b/src/libGLESv2/constants.h
@@ -23,7 +23,8 @@ enum
    IMPLEMENTATION_MAX_VERTEX_TEXTURE_IMAGE_UNITS = 16,
    IMPLEMENTATION_MAX_COMBINED_TEXTURE_IMAGE_UNITS = MAX_TEXTURE_IMAGE_UNITS + IMPLEMENTATION_MAX_VERTEX_TEXTURE_IMAGE_UNITS,    

-    IMPLEMENTATION_MAX_VARYING_VECTORS = 32
+    IMPLEMENTATION_MAX_VARYING_VECTORS = 32,
+    IMPLEMENTATION_MAX_DRAW_BUFFERS = 8
 };

 const float ALIASED_LINE_WIDTH_RANGE_MIN = 1.0f;

--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -2359,6 +2359,9 @@ int Renderer11::getNearestSupportedSamples(DXGI_FORMAT format, unsigned int requ

 unsigned int Renderer11::getMaxRenderTargets() const
 {
+    META_ASSERT(D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT <= gl::IMPLEMENTATION_MAX_DRAW_BUFFERS);
+    META_ASSERT(D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT <= gl::IMPLEMENTATION_MAX_DRAW_BUFFERS);
+
    switch (mFeatureLevel)
    {
      case D3D_FEATURE_LEVEL_11_0: