From 750b192a0229ecf401fbe4dd727725a6ef5350d9 Mon Sep 17 00:00:00 2001
From: quou <quou@disroot.org>
Date: Fri, 14 Mar 2025 21:23:41 +1100
Subject: implementing shader variants
---
c2.cpp | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
(limited to 'c2.cpp')
diff --git a/c2.cpp b/c2.cpp
index 58e33ff..1f55c15 100644
--- a/c2.cpp
+++ b/c2.cpp
@@ -60,33 +60,6 @@ static Buffer_Id upload_verts(Device* dev) {
return vbo;
}
-Texture_Id make_default_texture(Device* dev) {
- unsigned* mem;
- Texture_Id tex;
- Buffer_Id buf = dev->create_buffer(
- "default texture stage",
- 4,
- Buffer_Flags::copy_src |
- Buffer_Flags::cpu_readwrite
- );
- mem = (unsigned*)dev->map_buffer(buf, 0, 4);
- mem[0] = 0xffffffff;
- dev->unmap_buffer(buf);
- tex = dev->create_texture(
- "default PBR texture",
- texture_format_rgba8i,
- Texture_Flags::sampleable | Texture_Flags::copy_dst,
- 1,
- 1,
- 1,
- 1,
- 1,
- buf
- );
- dev->destroy_bufferi(buf);
- return tex;
-}
-
static Sampler_Id create_clamped_linear(Device* dev) {
Sampler_State s{};
s.min = Filter_Mode::linear;
@@ -642,7 +615,6 @@ struct C2 : public App {
Collider* box_col, * floor_col;
Texture* texture;
Texture* texture2;
- Texture_Id default_texture;
Entity_Id monkey, monkey2, box, floor;
Model_Scene scene;
Renderer renderer;
@@ -694,11 +666,10 @@ struct C2 : public App {
);
assets.init(&asset_arena, "pack", 128);
dev = Device::create(&video_arena, this);
- default_texture = make_default_texture(dev);
make_hdr_target();
make_ui_texture();
model_loader.init(dev, &assets);
- mat_loader.init(&assets, default_texture);
+ mat_loader.init(&assets);
register_asset_loader("MODL", &model_loader);
register_asset_loader("MTRL", &mat_loader);
shader = (Shader*)assets.load("triangle.csh");
@@ -1035,7 +1006,6 @@ struct C2 : public App {
ui->destroy();
deinit_editor();
assets.destroy();
- dev->destroy_texture(default_texture);
dev->destroy_texture(hdr_target);
dev->destroy_texture(hdr_resolved);
dev->destroy_texture(ms_depth);
--
cgit v1.2.3-54-g00ecf