KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno: fix PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE 

Fixes an assert in fd_acc_query_register_provider() about query provider
not already registered.

Fixes: 3f6b3d9d ("gallium: add PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE")
Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2017-10-01 15:29:24 -04:00
parent c3f51526ac
commit d304c467ba
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/freedreno/freedreno_batch.h
View File

@ -55,7 +55,7 @@ enum fd_render_stage {
FD_STAGE_ALL = 0xff,
};
#define MAX_HW_SAMPLE_PROVIDERS 4
#define MAX_HW_SAMPLE_PROVIDERS 5
struct fd_hw_sample_provider;
struct fd_hw_sample;

7
src/gallium/drivers/freedreno/freedreno_query.h
View File

@ -85,15 +85,16 @@ int pidx(unsigned query_type)
case PIPE_QUERY_OCCLUSION_COUNTER:
return 0;
case PIPE_QUERY_OCCLUSION_PREDICATE:
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
return 1;
case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE:
return 2;
/* TODO currently queries only emitted in main pass (not in binning pass)..
* which is fine for occlusion query, but pretty much not anything else.
*/
case PIPE_QUERY_TIME_ELAPSED:
return 2;
case PIPE_QUERY_TIMESTAMP:
return 3;
case PIPE_QUERY_TIMESTAMP:
return 4;
default:
return -1;
}