diff options
| author | Andre Weissflog <floooh@gmail.com> | 2020-06-21 19:24:09 +0200 |
|---|---|---|
| committer | Andre Weissflog <floooh@gmail.com> | 2020-06-21 19:24:09 +0200 |
| commit | 74ef01166c1b76c2e189a6a052df0feaf9a168e3 (patch) | |
| tree | 27ee5f4ae7ebf157d3174dca158a2ecd84f17f40 /util | |
| parent | f1dd65ddb1028df98eedc6eed7ae5aaf937abfa9 (diff) | |
sokol_gl.h, sokol_debugtext.h, metal: minor code cleanup in shader creation
Diffstat (limited to 'util')
| -rw-r--r-- | util/sokol_debugtext.h | 8 | ||||
| -rw-r--r-- | util/sokol_gl.h | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/util/sokol_debugtext.h b/util/sokol_debugtext.h index 7f50816a..3206c46b 100644 --- a/util/sokol_debugtext.h +++ b/util/sokol_debugtext.h @@ -3671,28 +3671,24 @@ static void _sdtx_setup_common(void) { shd_desc.vs.source = _sdtx_vs_src_gles2; shd_desc.fs.source = _sdtx_fs_src_gles2; #elif defined(SOKOL_METAL) + shd_desc.vs.entry = "main0"; + shd_desc.fs.entry = "main0"; switch (sg_query_backend()) { case SG_BACKEND_METAL_MACOS: shd_desc.vs.byte_code = _sdtx_vs_bytecode_metal_macos; shd_desc.vs.byte_code_size = sizeof(_sdtx_vs_bytecode_metal_macos); - shd_desc.vs.entry = "main0"; shd_desc.fs.byte_code = _sdtx_fs_bytecode_metal_macos; shd_desc.fs.byte_code_size = sizeof(_sdtx_fs_bytecode_metal_macos); - shd_desc.fs.entry = "main0"; break; case SG_BACKEND_METAL_IOS: shd_desc.vs.byte_code = _sdtx_vs_bytecode_metal_ios; shd_desc.vs.byte_code_size = sizeof(_sdtx_vs_bytecode_metal_ios); - shd_desc.vs.entry = "main0"; shd_desc.fs.byte_code = _sdtx_fs_bytecode_metal_ios; shd_desc.fs.byte_code_size = sizeof(_sdtx_fs_bytecode_metal_ios); - shd_desc.fs.entry = "main0"; break; default: shd_desc.vs.source = _sdtx_vs_src_metal_sim; - shd_desc.vs.entry = "main0"; shd_desc.fs.source = _sdtx_fs_src_metal_sim; - shd_desc.fs.entry = "main0"; break; } #elif defined(SOKOL_D3D11) diff --git a/util/sokol_gl.h b/util/sokol_gl.h index 444119f8..3abb2172 100644 --- a/util/sokol_gl.h +++ b/util/sokol_gl.h @@ -2706,28 +2706,24 @@ SOKOL_API_IMPL void sgl_setup(const sgl_desc_t* desc) { shd_desc.vs.source = _sgl_vs_source_glsl100; shd_desc.fs.source = _sgl_fs_source_glsl100; #elif defined(SOKOL_METAL) + shd_desc.vs.entry = "main0"; + shd_desc.fs.entry = "main0"; switch (sg_query_backend()) { case SG_BACKEND_METAL_MACOS: shd_desc.vs.byte_code = _sgl_vs_bytecode_metal_macos; shd_desc.vs.byte_code_size = sizeof(_sgl_vs_bytecode_metal_macos); - shd_desc.vs.entry = "main0"; shd_desc.fs.byte_code = _sgl_fs_bytecode_metal_macos; shd_desc.fs.byte_code_size = sizeof(_sgl_fs_bytecode_metal_macos); - shd_desc.fs.entry = "main0"; break; case SG_BACKEND_METAL_IOS: shd_desc.vs.byte_code = _sgl_vs_bytecode_metal_ios; shd_desc.vs.byte_code_size = sizeof(_sgl_vs_bytecode_metal_ios); - shd_desc.vs.entry = "main0"; shd_desc.fs.byte_code = _sgl_fs_bytecode_metal_ios; shd_desc.fs.byte_code_size = sizeof(_sgl_fs_bytecode_metal_ios); - shd_desc.fs.entry = "main0"; break; default: shd_desc.vs.source = _sgl_vs_source_metal_sim; - shd_desc.vs.entry = "main0"; shd_desc.fs.source = _sgl_fs_source_metal_sim; - shd_desc.fs.entry = "main0"; break; } #elif defined(SOKOL_D3D11) |