diff options
| author | Corbin Simpson <[email protected]> | 2010-06-22 23:11:01 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2010-06-22 23:11:01 -0700 |
| commit | a6cc91487446f8e1e72e4f67823a359c0b3a41d6 (patch) | |
| tree | a676a1a8e905699f1cadd3a9c01a19d14379bee8 | |
| parent | aa451d509df844e4652853f08e31bc1ee18c04ac (diff) | |
glhd: Add query protection.
Not quite copied from r300g. This is slightly more API-compliant.
| -rw-r--r-- | src/gallium/drivers/galahad/glhd_context.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_query.c | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/gallium/drivers/galahad/glhd_context.c b/src/gallium/drivers/galahad/glhd_context.c index 7a856ef5e1b..5531f579ec2 100644 --- a/src/gallium/drivers/galahad/glhd_context.c +++ b/src/gallium/drivers/galahad/glhd_context.c @@ -119,6 +119,16 @@ galahad_create_query(struct pipe_context *_pipe, struct galahad_context *glhd_pipe = galahad_context(_pipe); struct pipe_context *pipe = glhd_pipe->pipe; + if (query_type == PIPE_QUERY_OCCLUSION_COUNTER && + !pipe->screen->get_param(pipe->screen, PIPE_CAP_OCCLUSION_QUERY)) { + glhd_error("Occlusion query requested but not supported"); + } + + if (query_type == PIPE_QUERY_TIME_ELAPSED && + !pipe->screen->get_param(pipe->screen, PIPE_CAP_TIMER_QUERY)) { + glhd_error("Timer query requested but not supported"); + } + return pipe->create_query(pipe, query_type); } diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index 10cb468dfcc..10086ee9256 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -37,7 +37,9 @@ static struct pipe_query *r300_create_query(struct pipe_context *pipe, struct r300_screen *r300screen = r300->screen; struct r300_query *q; - assert(query_type == PIPE_QUERY_OCCLUSION_COUNTER); + if (query_type != PIPE_QUERY_OCCLUSION_COUNTER) { + return NULL; + } q = CALLOC_STRUCT(r300_query); if (!q) |