From 5bed38dcd92e11c060e626a6e53f4725d647ff7f Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 26 Dec 2011 17:09:09 +0900 Subject: [PATCH] Rename quaketxt.frag to quake2d.frag. It's actually fairly generic for 2d rendering (no lighting, palette lookup) --- libs/video/renderer/glsl/Makefile.am | 4 ++-- libs/video/renderer/glsl/glsl_draw.c | 10 +++++----- .../renderer/glsl/{quaketxt.frag => quake2d.frag} | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename libs/video/renderer/glsl/{quaketxt.frag => quake2d.frag} (100%) diff --git a/libs/video/renderer/glsl/Makefile.am b/libs/video/renderer/glsl/Makefile.am index 429ff11c2..40cdc9b51 100644 --- a/libs/video/renderer/glsl/Makefile.am +++ b/libs/video/renderer/glsl/Makefile.am @@ -2,8 +2,8 @@ AUTOMAKE_OPTIONS= foreign AM_CFLAGS= @PREFER_PIC@ INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS) -shader_src= quaketxt.frag quaketxt.vert -shader_gen= quaketxt.fc quaketxt.vc +shader_src= quake2d.frag quaketxt.vert +shader_gen= quake2d.fc quaketxt.vc if BUILD_GL noinst_LTLIBRARIES= libglsl.la diff --git a/libs/video/renderer/glsl/glsl_draw.c b/libs/video/renderer/glsl/glsl_draw.c index cb257b8de..5fea2faac 100644 --- a/libs/video/renderer/glsl/glsl_draw.c +++ b/libs/video/renderer/glsl/glsl_draw.c @@ -49,8 +49,8 @@ static const char quaketext_vert[] = #include "quaketxt.vc" ; -static const char quaketext_frag[] = -#include "quaketxt.fc" +static const char quake2d_frag[] = +#include "quake2d.fc" ; typedef struct { @@ -63,7 +63,7 @@ VISIBLE byte *draw_chars; static dstring_t *char_queue; static int char_texture; static int qtxt_vert; -static int qtxt_frag; +static int q2d_frag; static int qtxt_prog; static float proj_matrix[16]; @@ -170,9 +170,9 @@ Draw_Init (void) char_queue = dstring_new (); qtxt_vert = compile_shader ("quaketxt.vert", quaketext_vert, GL_VERTEX_SHADER); - qtxt_frag = compile_shader ("quaketxt.frag", quaketext_frag, + q2d_frag = compile_shader ("quake2d.frag", quake2d_frag, GL_FRAGMENT_SHADER); - qtxt_prog = link_program ("quaketxt", qtxt_vert, qtxt_frag); + qtxt_prog = link_program ("quaketxt", qtxt_vert, q2d_frag); resolve_shader_param (qtxt_prog, &charmap); resolve_shader_param (qtxt_prog, &palette); resolve_shader_param (qtxt_prog, &matrix); diff --git a/libs/video/renderer/glsl/quaketxt.frag b/libs/video/renderer/glsl/quake2d.frag similarity index 100% rename from libs/video/renderer/glsl/quaketxt.frag rename to libs/video/renderer/glsl/quake2d.frag