projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iris: Drop XXX about checking for swizzling
[mesa.git]
/
src
/
gallium
/
drivers
/
iris
/
iris_screen.c
diff --git
a/src/gallium/drivers/iris/iris_screen.c
b/src/gallium/drivers/iris/iris_screen.c
index 64514cddbc4013c3501d5ad1964c0b0004705c70..89f6f1bb85e915614b14cd8d99ce8ec3c9384ea6 100644
(file)
--- a/
src/gallium/drivers/iris/iris_screen.c
+++ b/
src/gallium/drivers/iris/iris_screen.c
@@
-86,7
+86,7
@@
iris_get_name(struct pipe_screen *pscreen)
chipset = "Unknown Intel Chipset";
break;
}
chipset = "Unknown Intel Chipset";
break;
}
- return
&chipset[9]
;
+ return
chipset
;
}
static int
}
static int
@@
-171,6
+171,7
@@
iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_TGSI_ARRAY_COMPONENTS:
case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS:
case PIPE_CAP_LOAD_CONSTBUF:
case PIPE_CAP_TGSI_ARRAY_COMPONENTS:
case PIPE_CAP_GLSL_TESS_LEVELS_AS_INPUTS:
case PIPE_CAP_LOAD_CONSTBUF:
+ case PIPE_CAP_NIR_COMPACT_ARRAYS:
return true;
case PIPE_CAP_TGSI_FS_FBFETCH:
case PIPE_CAP_POST_DEPTH_COVERAGE:
return true;
case PIPE_CAP_TGSI_FS_FBFETCH:
case PIPE_CAP_POST_DEPTH_COVERAGE:
@@
-238,8
+239,9
@@
iris_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_DEVICE_ID:
return screen->pci_id;
case PIPE_CAP_VIDEO_MEMORY:
case PIPE_CAP_DEVICE_ID:
return screen->pci_id;
case PIPE_CAP_VIDEO_MEMORY:
- return
0xffffffff
; // XXX: bogus
+ return
INT_MAX
; // XXX: bogus
case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
+ case PIPE_CAP_MAX_VARYINGS:
return 32;
case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
/* AMD_pinned_memory assumes the flexibility of using client memory
return 32;
case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
/* AMD_pinned_memory assumes the flexibility of using client memory
@@
-381,8
+383,6
@@
iris_get_compute_param(struct pipe_screen *pscreen,
struct brw_compiler *compiler = screen->compiler;
const struct gen_device_info *devinfo = &screen->devinfo;
struct brw_compiler *compiler = screen->compiler;
const struct gen_device_info *devinfo = &screen->devinfo;
- // XXX: cherryview fusing
-
const unsigned max_threads = MIN2(64, devinfo->max_cs_threads);
const uint32_t max_invocations = 32 * max_threads;
const unsigned max_threads = MIN2(64, devinfo->max_cs_threads);
const uint32_t max_invocations = 32 * max_threads;
@@
-555,6
+555,9
@@
iris_screen_create(int fd)
if (!gen_get_device_info(screen->pci_id, &screen->devinfo))
return NULL;
if (!gen_get_device_info(screen->pci_id, &screen->devinfo))
return NULL;
+ if (screen->devinfo.gen < 8 || screen->devinfo.is_cherryview)
+ return NULL;
+
screen->devinfo.timestamp_frequency =
iris_getparam_integer(screen, I915_PARAM_CS_TIMESTAMP_FREQUENCY);
screen->devinfo.timestamp_frequency =
iris_getparam_integer(screen, I915_PARAM_CS_TIMESTAMP_FREQUENCY);
@@
-571,8
+574,7
@@
iris_screen_create(int fd)
screen->precompile = env_var_as_boolean("shader_precompile", true);
screen->precompile = env_var_as_boolean("shader_precompile", true);
- bool hw_has_swizzling = false; // XXX: detect?
- isl_device_init(&screen->isl_dev, &screen->devinfo, hw_has_swizzling);
+ isl_device_init(&screen->isl_dev, &screen->devinfo, false);
screen->compiler = brw_compiler_create(screen, &screen->devinfo);
screen->compiler->shader_debug_log = iris_shader_debug_log;
screen->compiler = brw_compiler_create(screen, &screen->devinfo);
screen->compiler->shader_debug_log = iris_shader_debug_log;