Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-03 20:28:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Implement missing functions used by graphics

Browse Source
This commit is contained in:
korenkonder
2025-04-22 23:46:51 +03:00
parent e38311b226
commit a709b5ddfb
4 changed files with 1240 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/Vulkan/gl_wrap.cpp
+1124 -282
View File
File diff suppressed because it is too large Load Diff
src/CRE/Vulkan/gl_wrap.hpp
+74
View File
@@ -23,9 +23,15 @@
#include "VertexBuffer.hpp"
#include "WorkingBuffer.hpp"
struct shader_table;
struct shader_sub_table;
namespace Vulkan {
constexpr uint32_t MAX_COMBINED_TEXTURE_IMAGE_UNITS = 32;
constexpr uint32_t MAX_COLOR_ATTACHMENTS = 8;
constexpr uint32_t MAX_DRAW_BUFFERS = 8;
constexpr uint32_t MAX_SHADER_STORAGE_BUFFER_BINDINGS = 14;
constexpr uint32_t MAX_UNIFORM_BUFFER_BINDINGS = 14;
constexpr uint32_t MAX_VERTEX_ATTRIB_COUNT = 16;
enum gl_buffer_flags {
@@ -89,6 +95,8 @@ namespace Vulkan {
struct gl_program {
prj::shared_ptr<Vulkan::ShaderModule> vertex_shader_module;
prj::shared_ptr<Vulkan::ShaderModule> fragment_shader_module;
const shader_table* shader;
const shader_sub_table* sub_shader;
gl_program();
@@ -121,6 +129,72 @@ namespace Vulkan {
static gl_sampler* get(GLuint program);
};
struct gl_state_rect {
GLint x;
GLint y;
GLsizei width;
GLsizei height;
};
struct gl_state_struct {
vec4 clear_color;
float_t clear_depth;
int32_t clear_stencil;
int32_t pack_alignment;
int32_t unpack_alignment;
GLuint query_samples_passed;
GLuint program;
GLuint active_texture_index;
GLuint texture_binding_2d[Vulkan::MAX_COMBINED_TEXTURE_IMAGE_UNITS];
GLuint texture_binding_cube_map[Vulkan::MAX_COMBINED_TEXTURE_IMAGE_UNITS];
GLuint sampler_binding[Vulkan::MAX_COMBINED_TEXTURE_IMAGE_UNITS];
GLboolean blend;
GLenum blend_src_rgb;
GLenum blend_src_alpha;
GLenum blend_dst_rgb;
GLenum blend_dst_alpha;
GLenum blend_mode_rgb;
GLenum blend_mode_alpha;
GLuint read_framebuffer_binding;
GLuint draw_framebuffer_binding;
GLuint vertex_array_binding;
GLuint array_buffer_binding;
GLuint element_array_buffer_binding;
GLuint uniform_buffer_binding;
GLuint uniform_buffer_bindings[Vulkan::MAX_SHADER_STORAGE_BUFFER_BINDINGS];
GLintptr uniform_buffer_offsets[Vulkan::MAX_SHADER_STORAGE_BUFFER_BINDINGS];
GLsizeiptr uniform_buffer_sizes[Vulkan::MAX_SHADER_STORAGE_BUFFER_BINDINGS];
GLuint shader_storage_buffer_binding;
GLuint shader_storage_buffer_bindings[Vulkan::MAX_UNIFORM_BUFFER_BINDINGS];
GLintptr shader_storage_buffer_offsets[Vulkan::MAX_UNIFORM_BUFFER_BINDINGS];
GLsizeiptr shader_storage_buffer_sizes[Vulkan::MAX_UNIFORM_BUFFER_BINDINGS];
GLboolean color_mask[4];
GLboolean cull_face;
GLenum cull_face_mode;
GLboolean depth_test;
GLenum depth_func;
GLboolean depth_mask;
GLfloat line_width;
GLenum polygon_mode;
GLboolean multisample;
GLboolean primitive_restart;
GLuint primitive_restart_index;
gl_state_rect scissor_box;
GLboolean scissor_test;
GLboolean stencil_test;
GLenum stencil_func;
GLenum stencil_fail;
GLenum stencil_dpfail;
GLenum stencil_dppass;
GLuint stencil_mask;
GLint stencil_ref;
GLuint stencil_value_mask;
gl_state_rect viewport;
gl_state_struct();
};
struct gl_storage_buffer {
Vulkan::StorageBuffer storage_buffer;
bool copy_working_buffer;
src/CRE/shader.cpp
+42 -30
View File
@@ -41,9 +41,6 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
int32_t shader::bind(shader_set_data* set, uint32_t sub_index) {
set->curr_program = 0;
set->vp_desc = 0;
set->fp_desc = 0;
set->unival_hash = 0;
if (num_sub < 1)
return -1;
@@ -57,30 +54,20 @@ int32_t shader::bind(shader_set_data* set, uint32_t sub_index) {
int32_t unival_shad_curr = 1;
int32_t unival_shad = 0;
uint64_t unival_hash = 0;
if (num_uniform > 0) {
uint32_t unival_arr[0x20];
const int32_t* vp_unival_max = sub_shader->vp_unival_max;
const int32_t* fp_unival_max = sub_shader->fp_unival_max;
int32_t i = 0;
for (i = 0; i < num_uniform; i++) {
for (int32_t i = 0; i < num_uniform; i++) {
const int32_t unival = uniform_value[use_uniform[i]];
const int32_t unival_max = max_def(vp_unival_max[i], fp_unival_max[i]);
unival_shad += unival_shad_curr * min_def(unival, unival_max);
unival_shad_curr *= unival_max + 1;
unival_arr[i] = unival;
}
unival_hash = hash_xxh3_64bits(unival_arr, sizeof(uint32_t) * num_uniform);
}
GLuint program = sub_shader->programs[unival_shad];
set->curr_program = program;
set->vp_desc = sub_shader->vp_desc;
set->fp_desc = sub_shader->fp_desc;
set->unival_hash = unival_hash;
gl_state_use_program(program);
return 0;
@@ -505,9 +492,8 @@ void shader::unbind() {
gl_state_use_program(0);
}
shader_set_data::shader_set_data() : size(), shaders(), curr_program(),
primitive_restart(), primitive_restart_index(), get_index_by_name_func(),
get_name_by_index_func(), vp_desc(), fp_desc(), unival_hash() {
shader_set_data::shader_set_data() : size(), shaders(), curr_program(), primitive_restart(),
primitive_restart_index(), get_index_by_name_func(), get_name_by_index_func() {
}
@@ -856,6 +842,8 @@ void shader_set_data::load(farc* f, bool ignore_cache,
Vulkan::gl_program* vk_program = Vulkan::gl_program::get(programs[k]);
vk_program->vertex_shader_module = elem_vp->second;
vk_program->fragment_shader_module = elem_fp->second;
vk_program->shader = &shaders_table[i];
vk_program->sub_shader = sub_table;
}
}
vec_shader_module.clear();
@@ -889,6 +877,8 @@ void shader_set_data::load(farc* f, bool ignore_cache,
Vulkan::gl_program* vk_program = Vulkan::gl_program::get(programs[0]);
vk_program->vertex_shader_module = vp_shader_module;
vk_program->fragment_shader_module = fp_shader_module;
vk_program->shader = &shaders_table[i];
vk_program->sub_shader = sub_table;
}
}
}
@@ -1615,13 +1605,16 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
if (!Vulkan::use)
return true;
else if (!set->vp_desc || !set->fp_desc)
return false;
Vulkan::gl_program* vk_program = Vulkan::gl_program::get(set->curr_program);
if (!vk_program)
return false;
const shader_table* shader = vk_program->shader;
const shader_sub_table* sub_shader = vk_program->sub_shader;
if (!shader || !sub_shader || !sub_shader->vp_desc || !sub_shader->fp_desc)
return false;
Vulkan::gl_vertex_array* vk_vao = Vulkan::gl_vertex_array::get(gl_state.vertex_array_binding);
if (!vk_vao || type && !vk_vao->index_buffer_binding.buffer)
return false;
@@ -1649,7 +1642,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
bool enabled_attributes[Vulkan::MAX_VERTEX_ATTRIB_COUNT] = {};
int32_t attribute_sizes[Vulkan::MAX_VERTEX_ATTRIB_COUNT] = {};
const shader_description* vp_desc = set->vp_desc;
const shader_description* vp_desc = sub_shader->vp_desc;
while (vp_desc->type != SHADER_DESCRIPTION_NONE && vp_desc->type != SHADER_DESCRIPTION_END
&& vp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = vp_desc++;
@@ -1676,7 +1669,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
}
}
const shader_description* fp_desc = set->fp_desc;
const shader_description* fp_desc = sub_shader->fp_desc;
while (fp_desc->type != SHADER_DESCRIPTION_NONE && fp_desc->type != SHADER_DESCRIPTION_END
&& fp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = fp_desc++;
@@ -1702,11 +1695,30 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
}
}
const uint64_t vp_desc_hash = hash_xxh3_64bits(set->vp_desc,
sizeof(shader_description) * (vp_desc - set->vp_desc));
const uint64_t fp_desc_hash = hash_xxh3_64bits(set->fp_desc,
sizeof(shader_description) * (fp_desc - set->fp_desc));
const uint64_t unival_hash = set->unival_hash;
auto get_unival_hash = [](const shader_table* shader, const shader_sub_table* sub_shader) -> uint64_t {
if (shader->num_uniform <= 0)
return 0;
uint32_t unival_arr[0x20];
const int32_t* vp_unival_max = sub_shader->vp_unival_max;
const int32_t* fp_unival_max = sub_shader->fp_unival_max;
int32_t i = 0;
for (i = 0; i < shader->num_uniform; i++) {
const int32_t unival = uniform_value[shader->use_uniform[i]];
const int32_t unival_max = max_def(vp_unival_max[i], fp_unival_max[i]);
unival_arr[i] = min_def(unival, unival_max);
}
return hash_xxh3_64bits(unival_arr, sizeof(uint32_t) * shader->num_uniform);
};
const uint64_t vp_desc_hash = hash_xxh3_64bits(sub_shader->vp_desc,
sizeof(shader_description) * (vp_desc - sub_shader->vp_desc));
const uint64_t fp_desc_hash = hash_xxh3_64bits(sub_shader->fp_desc,
sizeof(shader_description) * (fp_desc - sub_shader->fp_desc));
const uint64_t unival_hash = get_unival_hash(shader, sub_shader);
prj::shared_ptr<Vulkan::DescriptorPipeline> descriptor_pipeline
= Vulkan::manager_get_descriptor_pipeline(vp_desc_hash, fp_desc_hash, unival_hash);
@@ -1728,7 +1740,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
VkDescriptorSetLayoutBinding* storage_binding = storage_bindings;
VkPushConstantRange* push_constant_range = push_constant_ranges;
vp_desc = set->vp_desc;
vp_desc = sub_shader->vp_desc;
while (vp_desc->type != SHADER_DESCRIPTION_NONE && vp_desc->type != SHADER_DESCRIPTION_END
&& vp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = vp_desc++;
@@ -1812,7 +1824,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
}
}
fp_desc = set->fp_desc;
fp_desc = sub_shader->fp_desc;
while (fp_desc->type != SHADER_DESCRIPTION_NONE && fp_desc->type != SHADER_DESCRIPTION_END
&& fp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = fp_desc++;
@@ -2157,7 +2169,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
uint32_t push_constant_data_size = 0;
VkShaderStageFlags push_constant_stage_flags = 0;
vp_desc = set->vp_desc;
vp_desc = sub_shader->vp_desc;
while (vp_desc->type != SHADER_DESCRIPTION_NONE && vp_desc->type != SHADER_DESCRIPTION_END
&& vp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = vp_desc++;
@@ -2302,7 +2314,7 @@ static bool shader_update_data(shader_set_data* set, GLenum mode, GLenum type, c
}
}
fp_desc = set->fp_desc;
fp_desc = sub_shader->fp_desc;
while (fp_desc->type != SHADER_DESCRIPTION_NONE && fp_desc->type != SHADER_DESCRIPTION_END
&& fp_desc->type != SHADER_DESCRIPTION_MAX) {
const shader_description* desc = fp_desc++;
src/CRE/shader.hpp
-4
View File
@@ -100,10 +100,6 @@ struct shader_set_data {
PFNSHADERGETINDEXFUNCPROC get_index_by_name_func;
PFNSHADERGETNAMEFUNCPROC get_name_by_index_func;
const shader_description* vp_desc;
const shader_description* fp_desc;
uint64_t unival_hash;
shader_set_data();
void disable_primitive_restart();