Parcourir la source

fix util headers for sg_buffer/image_usage

Andre Weissflog il y a 3 mois
Parent
commit
a2a609d86c
3 fichiers modifiés avec 13 ajouts et 8 suppressions
  1. 1 1
      util/sokol_fontstash.h
  2. 8 3
      util/sokol_nuklear.h
  3. 4 4
      util/sokol_spine.h

+ 1 - 1
util/sokol_fontstash.h

@@ -2160,7 +2160,7 @@ static int _sfons_render_create(void* user_ptr, int width, int height) {
     _sfons_clear(&img_desc, sizeof(img_desc));
     img_desc.width = sfons->cur_width;
     img_desc.height = sfons->cur_height;
-    img_desc.usage = SG_USAGE_DYNAMIC;
+    img_desc.usage.dynamic_update = true;
     img_desc.pixel_format = SG_PIXELFORMAT_R8;
     sfons->img = sg_make_image(&img_desc);
     return 1;

+ 8 - 3
util/sokol_nuklear.h

@@ -2547,7 +2547,10 @@ SOKOL_API_IMPL void snk_setup(const snk_desc_t* desc) {
     // vertex buffer
     _snuklear.vertex_buffer_size = (size_t)_snuklear.desc.max_vertices * sizeof(_snk_vertex_t);
     _snuklear.vbuf = sg_make_buffer(&(sg_buffer_desc){
-        .usage = SG_USAGE_STREAM,
+        .usage = {
+            .vertex_buffer = true,
+            .stream_update = true,
+        },
         .size = _snuklear.vertex_buffer_size,
         .label = "sokol-nuklear-vertices"
     });
@@ -2555,8 +2558,10 @@ SOKOL_API_IMPL void snk_setup(const snk_desc_t* desc) {
     // index buffer
     _snuklear.index_buffer_size = (size_t)_snuklear.desc.max_vertices * 3 * sizeof(uint16_t);
     _snuklear.ibuf = sg_make_buffer(&(sg_buffer_desc){
-        .type = SG_BUFFERTYPE_INDEXBUFFER,
-        .usage = SG_USAGE_STREAM,
+        .usage = {
+            .index_buffer = true,
+            .stream_update = true,
+        },
         .size = _snuklear.index_buffer_size,
         .label = "sokol-nuklear-indices"
     });

+ 4 - 4
util/sokol_spine.h

@@ -3817,8 +3817,8 @@ static sspine_resource_state _sspine_init_context(_sspine_context_t* ctx, const
 
     sg_buffer_desc vbuf_desc;
     _sspine_clear(&vbuf_desc, sizeof(vbuf_desc));
-    vbuf_desc.type = SG_BUFFERTYPE_VERTEXBUFFER;
-    vbuf_desc.usage = SG_USAGE_STREAM;
+    vbuf_desc.usage.vertex_buffer = true;
+    vbuf_desc.usage.stream_update = true;
     vbuf_desc.size = vbuf_size;
     vbuf_desc.label = "sspine-vbuf";
     ctx->vbuf = sg_make_buffer(&vbuf_desc);
@@ -3826,8 +3826,8 @@ static sspine_resource_state _sspine_init_context(_sspine_context_t* ctx, const
 
     sg_buffer_desc ibuf_desc;
     _sspine_clear(&ibuf_desc, sizeof(ibuf_desc));
-    ibuf_desc.type = SG_BUFFERTYPE_INDEXBUFFER;
-    ibuf_desc.usage = SG_USAGE_STREAM;
+    ibuf_desc.usage.index_buffer = true;
+    ibuf_desc.usage.stream_update = true;
     ibuf_desc.size = ibuf_size;
     ibuf_desc.label = "sspine-ibuf";
     ctx->ibuf = sg_make_buffer(&ibuf_desc);