Skip to content

Commit f50be50

Browse files
authored
Merge pull request #1173 from asarium/cleanup/tcache
Remove tcache_set from rendering API
2 parents 90a5af6 + 7cb652b commit f50be50

File tree

3 files changed

+0
-16
lines changed

3 files changed

+0
-16
lines changed

code/graphics/2d.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -698,9 +698,6 @@ typedef struct screen {
698698
// color buffer writes
699699
int (*gf_set_color_buffer)(int mode);
700700

701-
// set a texture into cache. for sectioned bitmaps, pass in sx and sy to set that particular section of the bitmap
702-
int (*gf_tcache_set)(int bitmap_id, int bitmap_type, float *u_scale, float *v_scale, int stage);
703-
704701
// preload a bitmap into texture memory
705702
int (*gf_preload)(int bitmap_num, int is_aabitmap);
706703

@@ -1010,10 +1007,6 @@ __inline void gr_fog_set(int fog_mode, int r, int g, int b, float fog_near = -1.
10101007
#define gr_set_cull GR_CALL(gr_screen.gf_set_cull)
10111008
#define gr_set_color_buffer GR_CALL(gr_screen.gf_set_color_buffer)
10121009

1013-
__inline int gr_tcache_set(int bitmap_id, int bitmap_type, float *u_scale, float *v_scale, int stage = 0)
1014-
{
1015-
return (*gr_screen.gf_tcache_set)(bitmap_id, bitmap_type, u_scale, v_scale, stage);
1016-
}
10171010

10181011
#define gr_preload GR_CALL(gr_screen.gf_preload)
10191012

code/graphics/grstub.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ int gr_stub_save_screen()
4848
return 1;
4949
}
5050

51-
int gr_stub_tcache_set(int bitmap_id, int bitmap_type, float *u_scale, float *v_scale, int tex_unit = 0)
52-
{
53-
return 0;
54-
}
55-
5651
int gr_stub_zbuffer_get()
5752
{
5853
return 0;
@@ -607,8 +602,6 @@ bool gr_stub_init()
607602
gr_screen.gf_set_cull = gr_stub_set_cull;
608603
gr_screen.gf_set_color_buffer = gr_stub_set_color_buffer;
609604

610-
gr_screen.gf_tcache_set = gr_stub_tcache_set;
611-
612605
gr_screen.gf_set_clear_color = gr_stub_set_clear_color;
613606

614607
gr_screen.gf_preload = gr_stub_preload;

code/graphics/opengl/gropengl.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,6 @@ void opengl_setup_function_pointers()
11881188
gr_screen.gf_set_cull = gr_opengl_set_cull;
11891189
gr_screen.gf_set_color_buffer = gr_opengl_set_color_buffer;
11901190

1191-
gr_screen.gf_tcache_set = gr_opengl_tcache_set;
1192-
11931191
gr_screen.gf_set_clear_color = gr_opengl_set_clear_color;
11941192

11951193
gr_screen.gf_preload = gr_opengl_preload;

0 commit comments

Comments
 (0)