summaryrefslogtreecommitdiffstats
path: root/src/gallium/include
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2019-04-22 17:35:27 -0400
committerMarek Olšák <[email protected]>2019-04-23 21:20:24 -0400
commite3841368f34afe844bab25010b89f497cacc1dad (patch)
tree5dcaf1e355321eff38c1c7727ef02a05bbd03cbf /src/gallium/include
parenta20800f49d1d665c4d93dcca87face1320423476 (diff)
gallium: replace DRM_CONF_THROTTLE with PIPE_CAP_MAX_FRAMES_IN_FLIGHT
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/gallium/include')
-rw-r--r--src/gallium/include/pipe/p_defines.h1
-rw-r--r--src/gallium/include/state_tracker/drm_driver.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 304c3dcb2bb..1760fc2f101 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -880,6 +880,7 @@ enum pipe_cap
PIPE_CAP_COMPUTE_SHADER_DERIVATIVES,
PIPE_CAP_TGSI_SKIP_SHRINK_IO_ARRAYS,
PIPE_CAP_IMAGE_LOAD_FORMATTED,
+ PIPE_CAP_MAX_FRAMES_IN_FLIGHT,
};
/**
diff --git a/src/gallium/include/state_tracker/drm_driver.h b/src/gallium/include/state_tracker/drm_driver.h
index 19cd19f26e1..8094734b672 100644
--- a/src/gallium/include/state_tracker/drm_driver.h
+++ b/src/gallium/include/state_tracker/drm_driver.h
@@ -15,8 +15,6 @@ struct pipe_resource;
* Configuration queries.
*/
enum drm_conf {
- /* How many frames to allow before throttling. Or -1 to indicate any number */
- DRM_CONF_THROTTLE, /* DRM_CONF_INT. */
/* Can this driver, running on this kernel, import and export dma-buf fds? */
DRM_CONF_SHARE_FD, /* DRM_CONF_BOOL. */
/* XML string describing the available config options. */
@@ -28,7 +26,6 @@ enum drm_conf {
* Type of configuration answer
*/
enum drm_conf_type {
- DRM_CONF_INT,
DRM_CONF_BOOL,
DRM_CONF_FLOAT,
DRM_CONF_POINTER
@@ -40,7 +37,6 @@ enum drm_conf_type {
struct drm_conf_ret {
enum drm_conf_type type;
union {
- int val_int;
bool val_bool;
float val_float;
void *val_pointer;