OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crocus: inline the d/s resource handling functions

Browse Source 
These are pretty simple, so inlining is fine and helps drawoverhead

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11707>
This commit is contained in:
Dave Airlie
2021-07-03 06:36:32 +10:00
parent f19f3f5496
commit 1d438c11c8
2 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gallium/drivers/crocus/crocus_resource.c
View File

@@ -289,17 +289,10 @@ crocus_query_dmabuf_modifiers(struct pipe_screen *pscreen,
*count = supported_mods; *count = supported_mods;
} }
struct pipe_resource * static struct pipe_resource *
crocus_resource_get_separate_stencil(struct pipe_resource *p_res) crocus_resource_get_separate_stencil(struct pipe_resource *p_res)
{ {
/* For packed depth-stencil, we treat depth as the primary resource return _crocus_resource_get_separate_stencil(p_res);
* and store S8 as the "second plane" resource.
*/
if (p_res->next && p_res->next->format == PIPE_FORMAT_S8_UINT)
return p_res->next;
return NULL;
} }
static void static void
@@ -310,34 +303,6 @@ crocus_resource_set_separate_stencil(struct pipe_resource *p_res,
pipe_resource_reference(&p_res->next, stencil); pipe_resource_reference(&p_res->next, stencil);
} }
void
crocus_get_depth_stencil_resources(const struct intel_device_info *devinfo,
struct pipe_resource *res,
struct crocus_resource **out_z,
struct crocus_resource **out_s)
{
if (!res) {
*out_z = NULL;
*out_s = NULL;
return;
}
/* gen4/5 only supports packed ds */
if (devinfo->ver < 6) {
*out_z = (void *)res;
*out_s = (void *)res;
return;
}
if (res->format != PIPE_FORMAT_S8_UINT) {
*out_z = (void *) res;
*out_s = (void *) crocus_resource_get_separate_stencil(res);
} else {
*out_z = NULL;
*out_s = (void *) res;
}
}
void void
crocus_resource_disable_aux(struct crocus_resource *res) crocus_resource_disable_aux(struct crocus_resource *res)
{ {

37
src/gallium/drivers/crocus/crocus_resource.h
View File

@@ -27,7 +27,7 @@
#include "util/u_inlines.h" #include "util/u_inlines.h"
#include "util/u_range.h" #include "util/u_range.h"
#include "intel/isl/isl.h" #include "intel/isl/isl.h"
#include "intel/dev/intel_device_info.h"
#include "crocus_bufmgr.h" #include "crocus_bufmgr.h"
struct crocus_batch; struct crocus_batch;
@@ -306,12 +306,41 @@ struct crocus_format_info crocus_format_for_usage(const struct intel_device_info
enum pipe_format pf, enum pipe_format pf,
isl_surf_usage_flags_t usage); isl_surf_usage_flags_t usage);
struct pipe_resource *crocus_resource_get_separate_stencil(struct pipe_resource *); static inline struct pipe_resource *
_crocus_resource_get_separate_stencil(struct pipe_resource *p_res)
{
/* For packed depth-stencil, we treat depth as the primary resource
* and store S8 as the "second plane" resource.
*/
if (p_res->next && p_res->next->format == PIPE_FORMAT_S8_UINT)
return p_res->next;
void crocus_get_depth_stencil_resources(const struct intel_device_info *devinfo, return NULL;
}
static inline void
crocus_get_depth_stencil_resources(const struct intel_device_info *devinfo,
struct pipe_resource *res, struct pipe_resource *res,
struct crocus_resource **out_z, struct crocus_resource **out_z,
struct crocus_resource **out_s); struct crocus_resource **out_s)
{
/* gen4/5 only supports packed ds */
if (devinfo->ver < 6) {
*out_z = (void *)res;
*out_s = (void *)res;
return;
}
if (res && res->format != PIPE_FORMAT_S8_UINT) {
*out_z = (void *) res;
*out_s = (void *) _crocus_resource_get_separate_stencil(res);
} else {
*out_z = NULL;
*out_s = (void *) res;
}
}
bool crocus_resource_set_clear_color(struct crocus_context *ice, bool crocus_resource_set_clear_color(struct crocus_context *ice,
struct crocus_resource *res, struct crocus_resource *res,
union isl_color_value color); union isl_color_value color);