commit f6fb959eeacff28579f996e122962ceda8b2845c
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:09:40 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:09:40 2013 +0000
tree 796150b6472a6f9f21c249738dd76bc38ab51c7f
parent 755012f4b2e7d0f7ff388663f1e5517307c84fa5

Replaced remaining uses of old texture conversion functions in gl objects.

TRAC #22972

Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2325 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Renderbuffer.cpp

diff --git a/src/libGLESv2/Renderbuffer.cpp b/src/libGLESv2/Renderbuffer.cpp
index 1275137..2831500 100644
--- a/src/libGLESv2/Renderbuffer.cpp
+++ b/src/libGLESv2/Renderbuffer.cpp
@@ -15,6 +15,7 @@
 #include "libGLESv2/Texture.h"
 #include "libGLESv2/renderer/Renderer.h"
 #include "libGLESv2/utilities.h"
+#include "libGLESv2/formatutils.h"
 
 namespace gl
 {
@@ -35,36 +36,6 @@
 {
 }
 
-GLuint RenderbufferInterface::getRedSize() const
-{
-    return gl::GetRedSize(getActualFormat());
-}
-
-GLuint RenderbufferInterface::getGreenSize() const
-{
-    return gl::GetGreenSize(getActualFormat());
-}
-
-GLuint RenderbufferInterface::getBlueSize() const
-{
-    return gl::GetBlueSize(getActualFormat());
-}
-
-GLuint RenderbufferInterface::getAlphaSize() const
-{
-    return gl::GetAlphaSize(getActualFormat());
-}
-
-GLuint RenderbufferInterface::getDepthSize() const
-{
-    return gl::GetDepthSize(getActualFormat());
-}
-
-GLuint RenderbufferInterface::getStencilSize() const
-{
-    return gl::GetStencilSize(getActualFormat());
-}
-
 ///// RenderbufferTexture2D Implementation ////////
 
 RenderbufferTexture2D::RenderbufferTexture2D(Texture2D *texture, GLenum target) : mTarget(target)
@@ -199,6 +170,9 @@
 {
     ASSERT(instance != NULL);
     mInstance = instance;
+
+    ASSERT(renderer != NULL);
+    mRenderer = renderer;
 }
 
 Renderbuffer::~Renderbuffer()
@@ -254,32 +228,32 @@
 
 GLuint Renderbuffer::getRedSize() const
 {
-    return mInstance->getRedSize();
+    return gl::GetRedBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLuint Renderbuffer::getGreenSize() const
 {
-    return mInstance->getGreenSize();
+    return gl::GetGreenBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLuint Renderbuffer::getBlueSize() const
 {
-    return mInstance->getBlueSize();
+    return gl::GetBlueBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLuint Renderbuffer::getAlphaSize() const
 {
-    return mInstance->getAlphaSize();
+    return gl::GetAlphaBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLuint Renderbuffer::getDepthSize() const
 {
-    return mInstance->getDepthSize();
+    return gl::GetDepthBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLuint Renderbuffer::getStencilSize() const
 {
-    return mInstance->getStencilSize();
+    return gl::GetStencilBits(getActualFormat(), mRenderer->getCurrentClientVersion());
 }
 
 GLsizei Renderbuffer::getSamples() const