diff options
| author | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 11:57:24 +0200 |
|---|---|---|
| committer | Andre Maasikas <amaasikas@gmail.com> | 2009-12-08 11:57:24 +0200 |
| commit | b5e256c76dea2182c82af2a4f66224735701d55a (patch) | |
| tree | 42ab2283fc94ab3deefc30983aaa10f283897dd6 /src/mesa/drivers/dri/intel | |
| parent | ac66598ed8bc218720cf2a1a7493b7e25ca9d962 (diff) | |
| parent | 0d4a05445c6b47b93269a3829afbe509ffec4817 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/drivers/dri/intel')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_fbo.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c index b6e0d823ed..5615040946 100644 --- a/src/mesa/drivers/dri/intel/intel_fbo.c +++ b/src/mesa/drivers/dri/intel/intel_fbo.c @@ -126,7 +126,7 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb, case GL_RGB16: rb->Format = MESA_FORMAT_ARGB8888; rb->DataType = GL_UNSIGNED_BYTE; - irb->texformat = MESA_FORMAT_XRGB8888; + irb->texformat = MESA_FORMAT_ARGB8888; /* XXX: Need xrgb8888 */ cpp = 4; break; case GL_RGBA: @@ -314,6 +314,10 @@ intel_create_renderbuffer(gl_format format) irb->Base.DataType = GL_UNSIGNED_BYTE; break; case MESA_FORMAT_XRGB8888: + /* XXX this is a hack since XRGB surfaces don't seem to work + * properly yet. Reading the alpha channel returns 0 instead of 1. + */ + format = MESA_FORMAT_ARGB8888; irb->Base._BaseFormat = GL_RGB; irb->Base.DataType = GL_UNSIGNED_BYTE; break; |