diff options
| author | Joshua Rowe <17525998+omnisci3nce@users.noreply.github.com> | 2024-06-09 14:59:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 14:59:01 +1000 |
| commit | 9c79df522980eabdc5e52592cbd152e2a285c4cc (patch) | |
| tree | 9082af194033e5e3e4a770456209d3bac7784943 /src/renderer/archive | |
| parent | 8d116bd23d9441e33cb3377e90c08169109b438a (diff) | |
| parent | d4ff15d9cd82a6e3bc71da9d04ee0f250460cef1 (diff) | |
Merge pull request #16 from omnisci3nce/port-opengl-ral
Bring back OpenGL (part 1)
Diffstat (limited to 'src/renderer/archive')
| -rw-r--r-- | src/renderer/archive/old_backend_vulkan.c | 6 | ||||
| -rw-r--r-- | src/renderer/archive/render_backend.h | 2 | ||||
| -rw-r--r-- | src/renderer/archive/render_types.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/renderer/archive/old_backend_vulkan.c b/src/renderer/archive/old_backend_vulkan.c index a18ca70..0dfba98 100644 --- a/src/renderer/archive/old_backend_vulkan.c +++ b/src/renderer/archive/old_backend_vulkan.c @@ -1,8 +1,8 @@ -#include "camera.h" -#include "primitives.h" #define CDEBUG -#define CEL_REND_BACKEND_VULKAN 1 +// #define CEL_REND_BACKEND_VULKAN 1 #if CEL_REND_BACKEND_VULKAN +#include "camera.h" +#include "primitives.h" // ^ Temporary #include <assert.h> diff --git a/src/renderer/archive/render_backend.h b/src/renderer/archive/render_backend.h index da30bcc..6df9c81 100644 --- a/src/renderer/archive/render_backend.h +++ b/src/renderer/archive/render_backend.h @@ -22,7 +22,7 @@ void clear_screen(vec3 colour); void texture_data_upload(texture* tex); void bind_texture(shader s, texture* tex, u32 slot); void bind_mesh_vertex_buffer(void* backend, mesh* mesh); -void draw_primitives(cel_primitive_topology primitive, u32 start_index, u32 count); +// void draw_primitives(cel_primitive_topology primitive, u32 start_index, u32 count); shader shader_create_separate(const char* vert_shader, const char* frag_shader); void set_shader(shader s); diff --git a/src/renderer/archive/render_types.h b/src/renderer/archive/render_types.h index f5ea986..5ee3316 100644 --- a/src/renderer/archive/render_types.h +++ b/src/renderer/archive/render_types.h @@ -147,10 +147,10 @@ typedef struct mesh { u32 vbo, vao; /** OpenGL data. TODO: dont leak OpenGL details */ } mesh; -// #ifndef TYPED_MESH_ARRAY -// KITC_DECL_TYPED_ARRAY(mesh) // creates "mesh_darray" -// #define TYPED_MESH_ARRAY -// #endif +#ifndef TYPED_MESH_ARRAY +KITC_DECL_TYPED_ARRAY(mesh) // creates "mesh_darray" +#define TYPED_MESH_ARRAY +#endif typedef struct model { str8 name; |