summaryrefslogtreecommitdiff
path: root/src/renderer
diff options
context:
space:
mode:
Diffstat (limited to 'src/renderer')
-rw-r--r--src/renderer/backends/backend_vulkan.h3
-rw-r--r--src/renderer/backends/vulkan_helpers.h10
-rw-r--r--src/renderer/ral.c22
-rw-r--r--src/renderer/ral.h9
-rw-r--r--src/renderer/ral_types.h30
-rw-r--r--src/renderer/render.h16
6 files changed, 61 insertions, 29 deletions
diff --git a/src/renderer/backends/backend_vulkan.h b/src/renderer/backends/backend_vulkan.h
index 7bdf821..77b9f94 100644
--- a/src/renderer/backends/backend_vulkan.h
+++ b/src/renderer/backends/backend_vulkan.h
@@ -4,8 +4,8 @@
#include <vulkan/vulkan_core.h>
#include "defines.h"
+#include "mem.h"
#include "ral.h"
-// #include "vulkan_helpers.h"
#define MAX_FRAMES_IN_FLIGHT 2
#define GPU_SWAPCHAIN_IMG_COUNT 2
@@ -102,4 +102,3 @@ typedef struct gpu_buffer {
VkDeviceMemory memory;
u64 size;
} gpu_buffer;
-
diff --git a/src/renderer/backends/vulkan_helpers.h b/src/renderer/backends/vulkan_helpers.h
index db9b5a4..23666c6 100644
--- a/src/renderer/backends/vulkan_helpers.h
+++ b/src/renderer/backends/vulkan_helpers.h
@@ -20,12 +20,12 @@ static void plat_get_required_extension_names(cstr_darray* extensions) {
}
// TODO(omni): port to using internal assert functions
-#define VK_CHECK(vulkan_expr) \
- do { \
- VkResult res = vulkan_expr; \
- if (res != VK_SUCCESS) { \
+#define VK_CHECK(vulkan_expr) \
+ do { \
+ VkResult res = vulkan_expr; \
+ if (res != VK_SUCCESS) { \
ERROR_EXIT("Vulkan error: %u (%s:%d)", res, __FILE__, __LINE__); \
- } \
+ } \
} while (0)
// TODO: typedef struct vk_debugger {} vk_debugger;
diff --git a/src/renderer/ral.c b/src/renderer/ral.c
new file mode 100644
index 0000000..25c2909
--- /dev/null
+++ b/src/renderer/ral.c
@@ -0,0 +1,22 @@
+#include "ral.h"
+
+/* typedef struct foo { */
+/* u32 a; */
+/* f32 b; */
+/* char c; */
+/* } foo; */
+
+/* TYPED_POOL(gpu_buffer, buffer); */
+
+/* typedef struct buffer_handle { */
+/* u32 raw; */
+/* } buffer_handle; */
+
+/* typedef struct gpu_buffer gpu_buffer; */
+TYPED_POOL(gpu_buffer, buffer);
+TYPED_POOL(gpu_texture, texture);
+
+struct resource_pools {
+ buffer_pool buffers;
+ texture_pool textures;
+};
diff --git a/src/renderer/ral.h b/src/renderer/ral.h
index ee65233..03bdeab 100644
--- a/src/renderer/ral.h
+++ b/src/renderer/ral.h
@@ -13,6 +13,7 @@
#include "buf.h"
#include "defines.h"
+#include "mem.h"
#include "ral_types.h"
#include "str.h"
@@ -40,6 +41,8 @@ typedef struct gpu_backend_pools {
// pools for each gpu structure
} gpu_backend_pools;
+typedef struct resource_pools resource_pools;
+
typedef enum pipeline_kind {
PIPELINE_GRAPHICS,
PIPELINE_COMPUTE,
@@ -78,11 +81,6 @@ struct graphics_pipeline_desc {
typedef struct gpu_renderpass_desc {
} gpu_renderpass_desc;
-typedef struct resource_pools {
- // TODO: buffer pool
- // TODO: texture pool
-} resource_pools;
-
// --- Lifecycle functions
bool gpu_backend_init(const char* window_name, struct GLFWwindow* window);
@@ -163,4 +161,3 @@ void vertex_desc_add(vertex_description* builder, const char* name, vertex_attri
// TEMP
void gpu_temp_draw(size_t n_verts);
-
diff --git a/src/renderer/ral_types.h b/src/renderer/ral_types.h
index c802a9b..5d4e88a 100644
--- a/src/renderer/ral_types.h
+++ b/src/renderer/ral_types.h
@@ -16,15 +16,24 @@
#define MAX_VERTEX_ATTRIBUTES 16
-#ifndef RENDERER_TYPED_HANDLES
+/* #ifndef RENDERER_TYPED_HANDLES */
CORE_DEFINE_HANDLE(buffer_handle);
CORE_DEFINE_HANDLE(texture_handle);
CORE_DEFINE_HANDLE(sampler_handle);
CORE_DEFINE_HANDLE(shader_handle);
CORE_DEFINE_HANDLE(model_handle);
#define ABSENT_MODEL_HANDLE 999999999
-#define RENDERER_TYPED_HANDLES
-#endif
+
+/* #define RENDERER_TYPED_HANDLES */
+/* #endif */
+
+/* typedef struct gpu_buffer { */
+/* u32 a; */
+/* } gpu_buffer; */
+
+/* #ifndef RAL_TYPED_POOLS */
+/* #define RAL_TYPED_POOLS */
+/* #endif */
// gpu types
typedef enum gpu_primitive_topology {
@@ -57,6 +66,9 @@ typedef struct texture_desc {
u32x2 extents;
} texture_desc;
+typedef struct gpu_texture {
+} gpu_texture;
+
typedef enum gpu_buffer_type {
CEL_BUFFER_DEFAULT, // on Vulkan this would be a storage buffer?
CEL_BUFFER_VERTEX,
@@ -157,11 +169,12 @@ typedef struct vertex_description {
typedef enum shader_visibility {
VISIBILITY_VERTEX = 1 << 0,
- VISIBILITY_FRAGMENT = 1 << 1 ,
+ VISIBILITY_FRAGMENT = 1 << 1,
VISIBILITY_COMPUTE = 1 << 2,
} shader_visibility;
-/** @brief Describes the kind of binding a `shader_binding` is for. This changes how we create backing data for it. */
+/** @brief Describes the kind of binding a `shader_binding` is for. This changes how we create
+ * backing data for it. */
typedef enum shader_binding_type {
/**
* @brief Binds a buffer to a shader
@@ -205,7 +218,7 @@ typedef struct shader_binding {
#define MAX_LAYOUT_BINDINGS 8
-/** @brief A list of bindings that describe what data a shader / pipeline expects
+/** @brief A list of bindings that describe what data a shader / pipeline expects
@note This roughly correlates to a descriptor set layout in Vulkan
*/
typedef struct shader_data_layout {
@@ -221,8 +234,9 @@ typedef struct shader_data {
/*
Usage:
- 1. When we create the pipeline, we must call a function that return a layout without .data fields
- 2. When binding
+ 1. When we create the pipeline, we must call a function that return a layout without .data
+ fields
+ 2. When binding
*/
typedef enum gpu_cull_mode { CULL_BACK_FACE, CULL_FRONT_FACE, CULL_COUNT } gpu_cull_mode;
diff --git a/src/renderer/render.h b/src/renderer/render.h
index c87e5f7..5657fc1 100644
--- a/src/renderer/render.h
+++ b/src/renderer/render.h
@@ -26,8 +26,8 @@ typedef struct camera camera;
void gfx_backend_draw_frame(renderer* ren, camera* camera, mat4 model, texture* tex);
typedef struct render_ctx {
- mat4 view;
- mat4 projection;
+ mat4 view;
+ mat4 projection;
} render_ctx;
// frontend -- these can be called from say a loop in an example, or via FFI
@@ -47,15 +47,15 @@ void shader_hot_reload(const char* filepath);
/**
* @brief Creates buffers and returns a struct that holds handles to our resources
- *
- * @param geometry
- * @param free_on_upload frees the CPU-side vertex/index data stored in geometry_data when we successfully upload
- that data to the GPU-side buffer
- * @return mesh
+ *
+ * @param geometry
+ * @param free_on_upload frees the CPU-side vertex/index data stored in geometry_data when we
+ successfully upload that data to the GPU-side buffer
+ * @return mesh
*/
mesh mesh_create(geometry_data* geometry, bool free_on_upload);
-void draw_mesh(mesh* mesh, mat4* model);//, mat4* view, mat4* proj); // TODO: material
+void draw_mesh(mesh* mesh, mat4* model); //, mat4* view, mat4* proj); // TODO: material
model_handle model_load(const char* debug_name, const char* filepath);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-09 22:15:02 +0000