Mesa (9.1): st/mesa: initialize Const.MaxColorAttachments
Ian Romanick
idr at kemper.freedesktop.org
Tue Jun 25 21:29:30 UTC 2013
Module: Mesa
Branch: 9.1
Commit: 03c3e082dc70dd2526caabdd23db40da23572ca2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=03c3e082dc70dd2526caabdd23db40da23572ca2
Author: Marek Olšák <maraeo at gmail.com>
Date: Thu May 2 03:29:47 2013 +0200
st/mesa: initialize Const.MaxColorAttachments
NOTE: This is a candidate for the stable branches.
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 6a2ad679e6f11f51e01001943f7d18329f077620)
---
src/mesa/state_tracker/st_extensions.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 04ffccb..73511be 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -117,9 +117,9 @@ void st_init_limits(struct st_context *st)
c->MaxViewportHeight =
c->MaxRenderbufferSize = c->MaxTextureRectSize;
- c->MaxDrawBuffers
- = _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
- 1, MAX_DRAW_BUFFERS);
+ c->MaxDrawBuffers = c->MaxColorAttachments =
+ _clamp(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
+ 1, MAX_DRAW_BUFFERS);
c->MaxDualSourceDrawBuffers
= _clamp(screen->get_param(screen, PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS),
@@ -155,10 +155,6 @@ void st_init_limits(struct st_context *st)
c->MaxTextureLodBias
= screen->get_paramf(screen, PIPE_CAPF_MAX_TEXTURE_LOD_BIAS);
- c->MaxDrawBuffers
- = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS),
- 1, MAX_DRAW_BUFFERS);
-
c->QuadsFollowProvokingVertexConvention = screen->get_param(
screen, PIPE_CAP_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION);
More information about the mesa-commit
mailing list