diff options
| author | Corbin Simpson <[email protected]> | 2010-06-22 23:00:44 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2010-06-22 23:00:44 -0700 |
| commit | aa451d509df844e4652853f08e31bc1ee18c04ac (patch) | |
| tree | c998badf7e19b6e31b39d9add5e1a9f1cf6cc1fa | |
| parent | 3f758d4ed42f6b4c6bed60f8270ef908d3829ee5 (diff) | |
glhd: Grab framebuffer state checks from r300g.
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_state.c | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index 6dfee2c7a71..7a856ef5e1b 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -497,6 +497,16 @@ galahad_set_framebuffer_state(struct pipe_context *_pipe, struct pipe_framebuffer_state *state = NULL; unsigned i; + if (_state->nr_cbufs > PIPE_MAX_COLOR_BUFS) { + glhd_error("%d render targets bound, but only %d are permitted by API", + _state->nr_cbufs, PIPE_MAX_COLOR_BUFS); + } else if (_state->nr_cbufs > + pipe->screen->get_param(pipe->screen, PIPE_CAP_MAX_RENDER_TARGETS)) { + glhd_warn("%d render targets bound, but only %d are supported", + _state->nr_cbufs, + pipe->screen->get_param(pipe->screen, PIPE_CAP_MAX_RENDER_TARGETS)); + } + /* unwrap the input state */ if (_state) { memcpy(&unwrapped_state, _state, sizeof(unwrapped_state)); diff --git a/src/gallium/drivers/galahad/glhd_context.h b/src/gallium/drivers/galahad/glhd_context.h index a8753d0255a..4e71753ac37 100644 --- a/src/gallium/drivers/galahad/glhd_context.h +++ b/src/gallium/drivers/galahad/glhd_context.h @@ -58,4 +58,7 @@ do { \ fprintf(stderr, "\n"); \ } while (0) +#define glhd_error(...) \ + glhd_warn(__VA_ARGS__); + #endif /* GLHD_CONTEXT_H */ diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c index bc2b62ba541..927e9362fb1 100644 --- a/src/gallium/drivers/r300/r300_state.c +++ b/src/gallium/drivers/r300/r300_state.c @@ -668,12 +668,6 @@ static void unsigned max_width, max_height, i; uint32_t zbuffer_bpp = 0; - if (state->nr_cbufs > 4) { - fprintf(stderr, "r300: Implementation error: Too many MRTs in %s, " - "refusing to bind framebuffer state!\n", __FUNCTION__); - return; - } - if (r300->screen->caps.is_r500) { max_width = max_height = 4096; } else if (r300->screen->caps.is_r400) { |