diff options
| author | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-04-13 20:25:39 -0700 |
| commit | 12f88ba32a14ea79134f4e995a55149f078a2f27 (patch) | |
| tree | 9070861dced23d0ad7dbec598bfd96b686eb7bf1 /src/gallium/drivers/i915 | |
| parent | 79fbec30fc16399ede9385ef52cb62cefbb388f4 (diff) | |
| parent | 171a570f388b2895d14f6d5418c99573cffd6369 (diff) | |
Merge remote-tracking branch 'public/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/i915')
| -rw-r--r-- | src/gallium/drivers/i915/i915_query.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_screen.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gallium/drivers/i915/i915_query.c b/src/gallium/drivers/i915/i915_query.c index 78d67cea2c9..fa1b01d1804 100644 --- a/src/gallium/drivers/i915/i915_query.c +++ b/src/gallium/drivers/i915/i915_query.c @@ -76,6 +76,11 @@ static boolean i915_get_query_result(struct pipe_context *ctx, return TRUE; } +static void +i915_set_active_query_state(struct pipe_context *pipe, boolean enable) +{ +} + void i915_init_query_functions(struct i915_context *i915) { @@ -84,5 +89,6 @@ i915_init_query_functions(struct i915_context *i915) i915->base.begin_query = i915_begin_query; i915->base.end_query = i915_end_query; i915->base.get_query_result = i915_get_query_result; + i915->base.set_active_query_state = i915_set_active_query_state; } diff --git a/src/gallium/drivers/i915/i915_screen.c b/src/gallium/drivers/i915/i915_screen.c index 68e32e51c34..9b6a6604965 100644 --- a/src/gallium/drivers/i915/i915_screen.c +++ b/src/gallium/drivers/i915/i915_screen.c @@ -270,6 +270,7 @@ i915_get_param(struct pipe_screen *screen, enum pipe_cap cap) case PIPE_CAP_PCI_DEVICE: case PIPE_CAP_PCI_FUNCTION: case PIPE_CAP_FRAMEBUFFER_NO_ATTACHMENT: + case PIPE_CAP_ROBUST_BUFFER_ACCESS_BEHAVIOR: return 0; case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: |