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

lavapipe: EXT_depth_clip_control

Browse Source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15126>
This commit is contained in:
Mike Blumenkrantz
2022-02-22 18:17:58 -05:00
committed by Marge Bot
parent f458c7f200
commit 07c0801e60
4 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/frontends/lavapipe/lvp_device.c
View File

@@ -131,6 +131,7 @@ static const struct vk_device_extension_table lvp_device_extensions_supported =
.EXT_color_write_enable = true,
.EXT_conditional_rendering = true,
.EXT_depth_clip_enable = true,
.EXT_depth_clip_control = true,
.EXT_extended_dynamic_state = true,
.EXT_extended_dynamic_state2 = true,
.EXT_external_memory_host = true,
@@ -592,6 +593,13 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetPhysicalDeviceFeatures2(
features->vertexInputDynamicState = true;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_CONTROL_FEATURES_EXT: {
VkPhysicalDeviceDepthClipControlFeaturesEXT *features =
(VkPhysicalDeviceDepthClipControlFeaturesEXT *)ext;
features->depthClipControl = true;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT: {
VkPhysicalDeviceTransformFeedbackFeaturesEXT *features =
(VkPhysicalDeviceTransformFeedbackFeaturesEXT*)ext;

59
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@@ -100,6 +100,9 @@ struct rendering_state {
int num_viewports;
struct pipe_viewport_state viewports[16];
struct {
float min, max;
} depth[16];
uint8_t patch_vertices;
ubyte index_size;
@@ -384,23 +387,36 @@ static void handle_compute_pipeline(struct vk_cmd_queue_entry *cmd,
}
static void
get_viewport_xform(const VkViewport *viewport,
float scale[3], float translate[3])
set_viewport_depth_xform(struct rendering_state *state, unsigned idx)
{
double n = state->depth[idx].min;
double f = state->depth[idx].max;
if (!state->rs_state.clip_halfz) {
state->viewports[idx].scale[2] = 0.5 * (f - n);
state->viewports[idx].translate[2] = 0.5 * (n + f);
} else {
state->viewports[idx].scale[2] = (f - n);
state->viewports[idx].translate[2] = n;
}
}
static void
get_viewport_xform(struct rendering_state *state,
const VkViewport *viewport,
unsigned idx)
{
float x = viewport->x;
float y = viewport->y;
float half_width = 0.5f * viewport->width;
float half_height = 0.5f * viewport->height;
double n = viewport->minDepth;
double f = viewport->maxDepth;
scale[0] = half_width;
translate[0] = half_width + x;
scale[1] = half_height;
translate[1] = half_height + y;
state->viewports[idx].scale[0] = half_width;
state->viewports[idx].translate[0] = half_width + x;
state->viewports[idx].scale[1] = half_height;
state->viewports[idx].translate[1] = half_height + y;
scale[2] = (f - n);
translate[2] = n;
memcpy(&state->depth[idx].min, &viewport->minDepth, sizeof(float) * 2);
}
/* enum re-indexing:
@@ -471,6 +487,7 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
LVP_FROM_HANDLE(lvp_pipeline, pipeline, cmd->u.bind_pipeline.pipeline);
bool dynamic_states[VK_DYNAMIC_STATE_STENCIL_REFERENCE+32];
unsigned fb_samples = 0;
bool clip_halfz = state->rs_state.clip_halfz;
memset(dynamic_states, 0, sizeof(dynamic_states));
if (pipeline->graphics_create_info.pDynamicState)
@@ -558,7 +575,6 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
state->rs_state.point_size_per_vertex = true;
state->rs_state.flatshade_first = !pipeline->provoking_vertex_last;
state->rs_state.point_quad_rasterization = true;
state->rs_state.clip_halfz = true;
state->rs_state.half_pixel_center = true;
state->rs_state.scissor = true;
state->rs_state.no_ms_sample_mask_out = true;
@@ -804,6 +820,12 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
} else
state->patch_vertices = 0;
bool halfz_changed = false;
if (!pipeline->negative_one_to_one != clip_halfz) {
state->rs_state.clip_halfz = !pipeline->negative_one_to_one;
halfz_changed = state->rs_dirty = true;
}
if (pipeline->graphics_create_info.pViewportState) {
const VkPipelineViewportStateCreateInfo *vpi= pipeline->graphics_create_info.pViewportState;
int i;
@@ -819,8 +841,16 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd,
if (!dynamic_states[VK_DYNAMIC_STATE_VIEWPORT] &&
!dynamic_states[conv_dynamic_state_idx(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT)]) {
for (i = 0; i < vpi->viewportCount; i++)
get_viewport_xform(&vpi->pViewports[i], state->viewports[i].scale, state->viewports[i].translate);
for (i = 0; i < vpi->viewportCount; i++) {
get_viewport_xform(state, &vpi->pViewports[i], i);
set_viewport_depth_xform(state, i);
}
state->vp_dirty = true;
} else if (halfz_changed) {
/* handle dynamic state: convert from one transform to the other */
unsigned num_viewports = dynamic_states[VK_DYNAMIC_STATE_VIEWPORT] ? vpi->viewportCount : state->num_viewports;
for (i = 0; i < num_viewports; i++)
set_viewport_depth_xform(state, i);
state->vp_dirty = true;
}
if (!dynamic_states[VK_DYNAMIC_STATE_SCISSOR] &&
@@ -2089,7 +2119,8 @@ static void set_viewport(unsigned first_viewport, unsigned viewport_count,
for (i = 0; i < viewport_count; i++) {
int idx = i + base;
const VkViewport *vp = &viewports[i];
get_viewport_xform(vp, state->viewports[idx].scale, state->viewports[idx].translate);
get_viewport_xform(state, vp, idx);
set_viewport_depth_xform(state, idx);
}
state->vp_dirty = true;
}

10
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@@ -816,6 +816,16 @@ lvp_graphics_pipeline_init(struct lvp_pipeline *pipeline,
deep_copy_graphics_create_info(pipeline->mem_ctx, &pipeline->graphics_create_info, pCreateInfo);
pipeline->is_compute_pipeline = false;
if (pipeline->graphics_create_info.pViewportState) {
/* if pViewportState is null, it means rasterization is discarded,
* so this is ignored
*/
const VkPipelineViewportDepthClipControlCreateInfoEXT *ccontrol = vk_find_struct_const(pCreateInfo->pViewportState,
PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT);
if (ccontrol)
pipeline->negative_one_to_one = !!ccontrol->negativeOneToOne;
}
const VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *pv_state =
vk_find_struct_const(pCreateInfo->pRasterizationState,
PIPELINE_RASTERIZATION_PROVOKING_VERTEX_STATE_CREATE_INFO_EXT);

1
src/gallium/frontends/lavapipe/lvp_private.h
View File

@@ -474,6 +474,7 @@ struct lvp_pipeline {
bool line_rectangular;
bool gs_output_lines;
bool provoking_vertex_last;
bool negative_one_to_one;
};
struct lvp_event {