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

vk: Better types for VkShaderStage, VkShaderStageFlags vars

Browse Source 
In most places, the variable type was the uninformative uint32_t.
This commit is contained in:
Chad Versace
2015-10-05 08:52:42 -07:00
parent 6317c3144d
commit 9c93aa9141
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vulkan/anv_cmd_buffer.c
View File

@@ -333,7 +333,7 @@ void anv_CmdBindDescriptorSets(
} }
if (set_layout->num_dynamic_buffers > 0) { if (set_layout->num_dynamic_buffers > 0) {
uint32_t s; VkShaderStage s;
for_each_bit(s, set_layout->shader_stages) { for_each_bit(s, set_layout->shader_stages) {
anv_cmd_buffer_ensure_push_constant_field(cmd_buffer, s, anv_cmd_buffer_ensure_push_constant_field(cmd_buffer, s,
dynamic_offsets); dynamic_offsets);
@@ -389,7 +389,7 @@ add_surface_state_reloc(struct anv_cmd_buffer *cmd_buffer,
VkResult VkResult
anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer, anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
unsigned stage, struct anv_state *bt_state) VkShaderStage stage, struct anv_state *bt_state)
{ {
struct anv_framebuffer *fb = cmd_buffer->state.framebuffer; struct anv_framebuffer *fb = cmd_buffer->state.framebuffer;
struct anv_subpass *subpass = cmd_buffer->state.subpass; struct anv_subpass *subpass = cmd_buffer->state.subpass;
@@ -473,7 +473,7 @@ anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
VkResult VkResult
anv_cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer, anv_cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer,
unsigned stage, struct anv_state *state) VkShaderStage stage, struct anv_state *state)
{ {
struct anv_pipeline_layout *layout; struct anv_pipeline_layout *layout;
uint32_t sampler_count; uint32_t sampler_count;
@@ -517,7 +517,7 @@ anv_cmd_buffer_emit_samplers(struct anv_cmd_buffer *cmd_buffer,
} }
static VkResult static VkResult
flush_descriptor_set(struct anv_cmd_buffer *cmd_buffer, uint32_t stage) flush_descriptor_set(struct anv_cmd_buffer *cmd_buffer, VkShaderStage stage)
{ {
struct anv_state surfaces = { 0, }, samplers = { 0, }; struct anv_state surfaces = { 0, }, samplers = { 0, };
VkResult result; VkResult result;
@@ -567,7 +567,8 @@ flush_descriptor_set(struct anv_cmd_buffer *cmd_buffer, uint32_t stage)
void void
anv_flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer) anv_flush_descriptor_sets(struct anv_cmd_buffer *cmd_buffer)
{ {
uint32_t s, dirty = cmd_buffer->state.descriptors_dirty & VkShaderStage s;
VkShaderStageFlags dirty = cmd_buffer->state.descriptors_dirty &
cmd_buffer->state.pipeline->active_stages; cmd_buffer->state.pipeline->active_stages;
VkResult result = VK_SUCCESS; VkResult result = VK_SUCCESS;
@@ -715,7 +716,7 @@ void anv_CmdPushConstants(
const void* values) const void* values)
{ {
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, cmdBuffer);
uint32_t stage; VkShaderStage stage;
for_each_bit(stage, stageFlags) { for_each_bit(stage, stageFlags) {
anv_cmd_buffer_ensure_push_constant_field(cmd_buffer, stage, client_data); anv_cmd_buffer_ensure_push_constant_field(cmd_buffer, stage, client_data);

2
src/vulkan/anv_device.c
View File

@@ -1462,7 +1462,7 @@ VkResult anv_CreateDescriptorSetLayout(
uint32_t surface_count[VK_SHADER_STAGE_NUM] = { 0, }; uint32_t surface_count[VK_SHADER_STAGE_NUM] = { 0, };
uint32_t num_dynamic_buffers = 0; uint32_t num_dynamic_buffers = 0;
uint32_t count = 0; uint32_t count = 0;
uint32_t stages = 0; VkShaderStageFlags stages = 0;
uint32_t s; uint32_t s;
for (uint32_t i = 0; i < pCreateInfo->count; i++) { for (uint32_t i = 0; i < pCreateInfo->count; i++) {

8
src/vulkan/anv_private.h
View File

@@ -724,7 +724,7 @@ struct anv_descriptor_set_layout {
uint32_t count; uint32_t count;
uint32_t num_dynamic_buffers; uint32_t num_dynamic_buffers;
uint32_t shader_stages; VkShaderStageFlags shader_stages;
struct anv_descriptor_slot entries[0]; struct anv_descriptor_slot entries[0];
}; };
@@ -828,8 +828,8 @@ struct anv_cmd_state {
uint32_t vb_dirty; uint32_t vb_dirty;
uint32_t dirty; uint32_t dirty;
uint32_t compute_dirty; uint32_t compute_dirty;
uint32_t descriptors_dirty; VkShaderStageFlags descriptors_dirty;
uint32_t push_constants_dirty; VkShaderStageFlags push_constants_dirty;
uint32_t scratch_size; uint32_t scratch_size;
struct anv_pipeline * pipeline; struct anv_pipeline * pipeline;
struct anv_pipeline * compute_pipeline; struct anv_pipeline * compute_pipeline;
@@ -1034,7 +1034,7 @@ struct anv_pipeline {
uint32_t nr_gs_entries; uint32_t nr_gs_entries;
} urb; } urb;
uint32_t active_stages; VkShaderStageFlags active_stages;
struct anv_state_stream program_stream; struct anv_state_stream program_stream;
struct anv_state blend_state; struct anv_state blend_state;
uint32_t vs_simd8; uint32_t vs_simd8;

5
src/vulkan/gen8_cmd_buffer.c
View File

@@ -32,8 +32,6 @@
static void static void
gen8_cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer) gen8_cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer)
{ {
uint32_t stage;
static const uint32_t push_constant_opcodes[] = { static const uint32_t push_constant_opcodes[] = {
[VK_SHADER_STAGE_VERTEX] = 21, [VK_SHADER_STAGE_VERTEX] = 21,
[VK_SHADER_STAGE_TESS_CONTROL] = 25, /* HS */ [VK_SHADER_STAGE_TESS_CONTROL] = 25, /* HS */
@@ -43,7 +41,8 @@ gen8_cmd_buffer_flush_push_constants(struct anv_cmd_buffer *cmd_buffer)
[VK_SHADER_STAGE_COMPUTE] = 0, [VK_SHADER_STAGE_COMPUTE] = 0,
}; };
uint32_t flushed = 0; VkShaderStage stage;
VkShaderStageFlags flushed = 0;
for_each_bit(stage, cmd_buffer->state.push_constants_dirty) { for_each_bit(stage, cmd_buffer->state.push_constants_dirty) {
struct anv_state state = anv_cmd_buffer_push_constants(cmd_buffer, stage); struct anv_state state = anv_cmd_buffer_push_constants(cmd_buffer, stage);