diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2017-05-25 21:26:09 -0700 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-06-01 10:09:43 +0200 |
| commit | f1d487f4f048603b37c07ba3e943aafda62a51af (patch) | |
| tree | 67174467d9167fd1f4435c3abdef1676281cd529 /src/mesa/drivers/dri | |
| parent | 57b38cc0774f1ca5fd8afe16728dd5d248b61b65 (diff) | |
r100: Use _mesa_get_format_base_format in radeon_update_wrapper
The wrapper is for a renderbuffer around a texture. Textures can have
formats (e.g., 3) that aren't valide for API generated renderbuffers.
_mesa_base_fbo_format will return 0, but _mesa_get_format_base_format
will return the base format of RGB.
Fixes a crashes in piglit tests fbo-alphatest-formats (all subtests
pass) and fbo-colormask-formats (some subtests pass, some fail).
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit 303b47f253f595ca0f708bef1059cbb4996f83a0)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_fbo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index 4d75d149b27..89ea7765269 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -739,7 +739,7 @@ radeon_update_wrapper(struct gl_context *ctx, struct radeon_renderbuffer *rrb, rrb->pitch = texImage->Width * rrb->cpp; rb->Format = texImage->TexFormat; rb->InternalFormat = texImage->InternalFormat; - rb->_BaseFormat = _mesa_base_fbo_format(ctx, rb->InternalFormat); + rb->_BaseFormat = _mesa_get_format_base_format(rb->Format); rb->Width = texImage->Width; rb->Height = texImage->Height; rb->Delete = radeon_delete_renderbuffer; |