diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-11 12:57:11 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-02-18 15:39:28 +0100 |
| commit | 7e41f4785a8b01bc71bd30739c1586e8f95d477c (patch) | |
| tree | 476a783fb77d6cb82b9b5c312e6c4c5a3b136370 | |
| parent | 964399dc875aa8fd6a094115c1f7945fa1223420 (diff) | |
glamo: fbo, use MESA_FORMAT_* wrt http://cgit.freedesktop.org/mesa/mesa/commit/?id=45e76d2665b38ba3787548310efc59e969124c01
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | src/mesa/drivers/dri/glamo/glamo_fbo.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/glamo/glamo_fbo.c b/src/mesa/drivers/dri/glamo/glamo_fbo.c index 1a41db79b5..c866d21eef 100644 --- a/src/mesa/drivers/dri/glamo/glamo_fbo.c +++ b/src/mesa/drivers/dri/glamo/glamo_fbo.c @@ -26,6 +26,7 @@ #include "main/imports.h" #include "main/macros.h" #include "main/mtypes.h" +#include "main/formats.h" #include "main/fbobject.h" #include "main/framebuffer.h" #include "main/renderbuffer.h" @@ -70,7 +71,7 @@ static GLboolean glamo_alloc_window_storage(GLcontext *ctx, ASSERT(rb->Name == 0); rb->Width = width; rb->Height = height; - rb->_ActualFormat = internalFormat; + rb->Format = internalFormat; return GL_TRUE; } @@ -89,18 +90,14 @@ struct glamo_renderbuffer *glamo_create_renderbuffer(GLenum format, switch (format) { case GL_RGB5: - grb->base._ActualFormat = GL_RGB5; - grb->base._BaseFormat = GL_RGBA; - grb->base.RedBits = 5; - grb->base.GreenBits = 6; - grb->base.BlueBits = 5; + grb->base.Format = MESA_FORMAT_RGB565; + grb->base._BaseFormat = GL_RGB; + grb->base.DataType = GL_UNSIGNED_BYTE; break; case GL_DEPTH_COMPONENT16: - grb->base._ActualFormat = GL_DEPTH_COMPONENT16; - grb->base._BaseFormat = GL_DEPTH_COMPONENT; - grb->base.DepthBits = 16; grb->base.DataType = GL_UNSIGNED_SHORT; + grb->base._BaseFormat = GL_DEPTH_COMPONENT; break; default: fprintf(stderr, "%s: Unknown format 0x%04x\n", __FUNCTION__, format); |