fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-05 06:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

mesa: Convert colors if span ChanType and renderbuffer data type don't match

Browse source 
This is a partial revert of f9874fe.  It turns out that the types
don't always match.  Specifically, this can happen when doing
glCopyPixels from a float FBO to a RGBA8 FBO.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45429
Reviewed-by: Brian Paul <brianp@vmware.com>
(cherry picked from commit 660ed923de)
This commit is contained in:
Ian Romanick 2012-01-31 11:29:06 -07:00
parent c34947dbb1
commit 65b9c1dee6
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/swrast/s_span.c
View file

@ -1337,12 +1337,23 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)
if (rb) {
GLchan rgbaSave[MAX_WIDTH][4];
if (span->array->ChanType == GL_UNSIGNED_BYTE) {
span->array->rgba = span->array->rgba8;
GLenum datatype;
GLuint comps;
_mesa_format_to_type_and_comps(rb->Format, &datatype, &comps);
/* set span->array->rgba to colors for render buffer's datatype */
if (datatype != span->array->ChanType) {
convert_color_type(span, datatype, 0);
}
else {
span->array->rgba = (void *)
span->array->attribs[FRAG_ATTRIB_COL0];
if (span->array->ChanType == GL_UNSIGNED_BYTE) {
span->array->rgba = span->array->rgba8;
}
else {
span->array->rgba = (void *)
span->array->attribs[FRAG_ATTRIB_COL0];
}
}
if (!multiFragOutputs && numBuffers > 1) {