gfx: move to libtrx

LostArtefacts · Sep 15, 2024 · 8e935df · 8e935df
1 parent 5750b06
commit 8e935df
Show file tree

Hide file tree

Showing 41 changed files with 17 additions and 14,484 deletions.
diff --git a/meson.build b/meson.build
@@ -7,7 +7,16 @@ project(
   ],
 )
 
-trx = subproject('libtrx', default_options: {'tr_version': '1'})
+if host_machine.system() == 'darwin'
+  gfx_gl_default_backend = 'GFX_GL_33C'
+else
+  gfx_gl_default_backend = 'GFX_GL_21'
+endif
+
+trx = subproject('libtrx', default_options: {
+  'tr_version': '1',
+  'gfx_gl_default_backend': gfx_gl_default_backend,
+})
 c_compiler = meson.get_compiler('c')
 
 build_opts = [
@@ -264,21 +273,6 @@ sources = [
   'src/game/stats.c',
   'src/game/text.c',
   'src/game/viewport.c',
-  'src/gfx/2d/2d_renderer.c',
-  'src/gfx/2d/2d_surface.c',
-  'src/gfx/3d/3d_renderer.c',
-  'src/gfx/3d/vertex_stream.c',
-  'src/gfx/context.c',
-  'src/gfx/gl/buffer.c',
-  'src/gfx/gl/gl_core_3_3.c',
-  'src/gfx/gl/program.c',
-  'src/gfx/gl/sampler.c',
-  'src/gfx/gl/texture.c',
-  'src/gfx/gl/utils.c',
-  'src/gfx/gl/vertex_array.c',
-  'src/gfx/renderers/fbo_renderer.c',
-  'src/gfx/renderers/legacy_renderer.c',
-  'src/gfx/screenshot.c',
   'src/global/enum_str.c',
   'src/global/vars.c',
   'src/math/math.c',
@@ -305,18 +299,6 @@ dependencies = [
   dep_zlib,
 ]
 
-gfx_options = configuration_data()
-
-if host_machine.system() == 'darwin'
-  gfx_options.set('GFX_GL_DEFAULT_BACKEND', 'GFX_GL_33C')
-else
-  gfx_options.set('GFX_GL_DEFAULT_BACKEND', 'GFX_GL_21')
-endif
-
-configure_file(
-  output: 'gfx_options.h',
-  configuration: gfx_options)
-
 executable(
   'TR1X',
   sources,

diff --git a/src/config.h b/src/config.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "gfx/common.h"
-#include "gfx/context.h"
 #include "global/types.h"
 
+#include <libtrx/gfx/common.h>
+
 #include <stdbool.h>
 #include <stdint.h>
 

diff --git a/src/game/option/option_graphics.c b/src/game/option/option_graphics.c
@@ -6,10 +6,9 @@
 #include "game/output.h"
 #include "game/screen.h"
 #include "game/text.h"
-#include "gfx/common.h"
-#include "gfx/context.h"
 #include "global/const.h"
 
+#include <libtrx/gfx/context.h>
 #include <libtrx/utils.h>
 
 #include <stdbool.h>

diff --git a/src/game/shell.c b/src/game/shell.c
@@ -18,7 +18,6 @@
 #include "game/screen.h"
 #include "game/sound.h"
 #include "game/text.h"
-#include "gfx/common.h"
 #include "global/types.h"
 #include "global/vars.h"
 #include "specific/s_shell.h"

diff --git a/src/gfx/2d/2d_renderer.c b/src/gfx/2d/2d_renderer.c
diff --git a/src/gfx/2d/2d_renderer.h b/src/gfx/2d/2d_renderer.h
diff --git a/src/gfx/2d/2d_surface.c b/src/gfx/2d/2d_surface.c