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

cso: constify some parameters to remove typecasts

Browse Source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19129>
This commit is contained in:
Marek Olšák
2022-08-06 17:28:34 -04:00
committed by Marge Bot
parent 97ec1de8f3
commit 224735abaf
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/cso_cache/cso_cache.c
+1 -1
View File
@@ -151,7 +151,7 @@ cso_hash_find_data_from_template(struct cso_hash *hash,
struct cso_hash_iter
cso_find_state_template(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *templ, unsigned size)
const void *templ, unsigned size)
{
struct cso_hash_iter iter = cso_find_state(sc, hash_key, type);
while (!cso_hash_iter_is_null(iter)) {
src/gallium/auxiliary/cso_cache/cso_cache.h
+4 -3
View File
@@ -174,7 +174,7 @@ cso_find_state(struct cso_cache *sc,
struct cso_hash_iter
cso_find_state_template(struct cso_cache *sc,
unsigned hash_key, enum cso_cache_type type,
void *templ, unsigned size);
const void *templ, unsigned size);
void
cso_set_maximum_cache_size(struct cso_cache *sc, int number);
@@ -185,9 +185,10 @@ cso_delete_state(struct pipe_context *pipe, void *state,
static inline unsigned
cso_construct_key(void *key, int key_size)
cso_construct_key(const void *key, int key_size)
{
unsigned hash = 0, *ikey = (unsigned *)key;
unsigned hash = 0;
const unsigned *ikey = (const unsigned *)key;
unsigned num_elements = key_size / 4;
assert(key_size % 4 == 0);
src/gallium/auxiliary/cso_cache/cso_context.c
+10 -10
View File
@@ -456,10 +456,10 @@ cso_set_blend(struct cso_context *ctx,
const unsigned key_size = templ->independent_blend_enable ?
sizeof(struct pipe_blend_state) :
(char *)&(templ->rt[1]) - (char *)templ;
const unsigned hash_key = cso_construct_key((void*)templ, key_size);
const unsigned hash_key = cso_construct_key(templ, key_size);
struct cso_hash_iter iter =
cso_find_state_template(&ctx->cache, hash_key, CSO_BLEND,
(void*)templ, key_size);
cso_find_state_template(&ctx->cache, hash_key, CSO_BLEND, templ,
key_size);
void *handle;
if (cso_hash_iter_is_null(iter)) {
@@ -514,11 +514,11 @@ cso_set_depth_stencil_alpha(struct cso_context *ctx,
const struct pipe_depth_stencil_alpha_state *templ)
{
const unsigned key_size = sizeof(struct pipe_depth_stencil_alpha_state);
const unsigned hash_key = cso_construct_key((void*)templ, key_size);
const unsigned hash_key = cso_construct_key(templ, key_size);
struct cso_hash_iter iter = cso_find_state_template(&ctx->cache,
hash_key,
CSO_DEPTH_STENCIL_ALPHA,
(void*)templ, key_size);
templ, key_size);
void *handle;
if (cso_hash_iter_is_null(iter)) {
@@ -577,11 +577,11 @@ cso_set_rasterizer(struct cso_context *ctx,
const struct pipe_rasterizer_state *templ)
{
const unsigned key_size = sizeof(struct pipe_rasterizer_state);
const unsigned hash_key = cso_construct_key((void*)templ, key_size);
const unsigned hash_key = cso_construct_key(templ, key_size);
struct cso_hash_iter iter = cso_find_state_template(&ctx->cache,
hash_key,
CSO_RASTERIZER,
(void*)templ, key_size);
templ, key_size);
void *handle = NULL;
/* We can't have both point_quad_rasterization (sprites) and point_smooth
@@ -1097,7 +1097,7 @@ cso_set_vertex_elements_direct(struct cso_context *ctx,
const unsigned hash_key = cso_construct_key((void*)velems, key_size);
struct cso_hash_iter iter =
cso_find_state_template(&ctx->cache, hash_key, CSO_VELEMENTS,
(void*)velems, key_size);
velems, key_size);
void *handle;
if (cso_hash_iter_is_null(iter)) {
@@ -1279,12 +1279,12 @@ set_sampler(struct cso_context *ctx, enum pipe_shader_type shader_stage,
unsigned idx, const struct pipe_sampler_state *templ,
size_t key_size)
{
unsigned hash_key = cso_construct_key((void*)templ, key_size);
unsigned hash_key = cso_construct_key(templ, key_size);
struct cso_sampler *cso;
struct cso_hash_iter iter =
cso_find_state_template(&ctx->cache,
hash_key, CSO_SAMPLER,
(void *) templ, key_size);
templ, key_size);
if (cso_hash_iter_is_null(iter)) {
cso = MALLOC(sizeof(struct cso_sampler));
src/gallium/auxiliary/util/u_vbuf.c
+2 -2
View File
@@ -393,9 +393,9 @@ u_vbuf_set_vertex_elements_internal(struct u_vbuf *mgr,
/* need to include the count into the stored state data too. */
key_size = sizeof(struct pipe_vertex_element) * velems->count +
sizeof(unsigned);
hash_key = cso_construct_key((void*)velems, key_size);
hash_key = cso_construct_key(velems, key_size);
iter = cso_find_state_template(&mgr->cso_cache, hash_key, CSO_VELEMENTS,
(void*)velems, key_size);
velems, key_size);
if (cso_hash_iter_is_null(iter)) {
struct cso_velements *cso = MALLOC_STRUCT(cso_velements);