diff options
| -rw-r--r-- | Makefile | 340 | ||||
| -rw-r--r-- | src/client/client.h | 2 | ||||
| -rw-r--r-- | src/null/null_glimp.c | 2 | ||||
| -rw-r--r-- | src/renderercommon/iqm.h (renamed from src/renderer/iqm.h) | 0 | ||||
| -rw-r--r-- | src/renderercommon/tr_public.h (renamed from src/renderer/tr_public.h) | 0 | ||||
| -rw-r--r-- | src/renderercommon/tr_types.h (renamed from src/renderer/tr_types.h) | 0 | ||||
| -rw-r--r-- | src/renderergl1/qgl.h (renamed from src/renderer/qgl.h) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_animation.c (renamed from src/renderer/tr_animation.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_backend.c (renamed from src/renderer/tr_backend.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_bsp.c (renamed from src/renderer/tr_bsp.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_cmds.c (renamed from src/renderer/tr_cmds.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_curve.c (renamed from src/renderer/tr_curve.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_flares.c (renamed from src/renderer/tr_flares.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_font.c (renamed from src/renderer/tr_font.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image.c (renamed from src/renderer/tr_image.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image_bmp.c (renamed from src/renderer/tr_image_bmp.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image_jpg.c (renamed from src/renderer/tr_image_jpg.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image_pcx.c (renamed from src/renderer/tr_image_pcx.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image_png.c (renamed from src/renderer/tr_image_png.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_image_tga.c (renamed from src/renderer/tr_image_tga.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_init.c (renamed from src/renderer/tr_init.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_light.c (renamed from src/renderer/tr_light.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_local.h (renamed from src/renderer/tr_local.h) | 4 | ||||
| -rw-r--r-- | src/renderergl1/tr_main.c (renamed from src/renderer/tr_main.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_marks.c (renamed from src/renderer/tr_marks.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_mesh.c (renamed from src/renderer/tr_mesh.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_model.c (renamed from src/renderer/tr_model.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_model_iqm.c (renamed from src/renderer/tr_model_iqm.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_noise.c (renamed from src/renderer/tr_noise.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_scene.c (renamed from src/renderer/tr_scene.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_shade.c (renamed from src/renderer/tr_shade.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_shade_calc.c (renamed from src/renderer/tr_shade_calc.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_shader.c (renamed from src/renderer/tr_shader.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_shadows.c (renamed from src/rend2/tr_shadows.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_sky.c (renamed from src/renderer/tr_sky.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_subs.c (renamed from src/rend2/tr_subs.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_surface.c (renamed from src/renderer/tr_surface.c) | 0 | ||||
| -rw-r--r-- | src/renderergl1/tr_world.c (renamed from src/renderer/tr_world.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/bokeh_fp.glsl (renamed from src/rend2/glsl/bokeh_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/bokeh_vp.glsl (renamed from src/rend2/glsl/bokeh_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/calclevels4x_fp.glsl (renamed from src/rend2/glsl/calclevels4x_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/calclevels4x_vp.glsl (renamed from src/rend2/glsl/calclevels4x_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/depthblur_fp.glsl (renamed from src/rend2/glsl/depthblur_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/depthblur_vp.glsl (renamed from src/rend2/glsl/depthblur_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/dlight_fp.glsl (renamed from src/rend2/glsl/dlight_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/dlight_vp.glsl (renamed from src/rend2/glsl/dlight_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/down4x_fp.glsl (renamed from src/rend2/glsl/down4x_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/down4x_vp.glsl (renamed from src/rend2/glsl/down4x_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/fogpass_fp.glsl (renamed from src/rend2/glsl/fogpass_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/fogpass_vp.glsl (renamed from src/rend2/glsl/fogpass_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/generic_fp.glsl (renamed from src/rend2/glsl/generic_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/generic_vp.glsl (renamed from src/rend2/glsl/generic_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/lightall_fp.glsl (renamed from src/rend2/glsl/lightall_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/lightall_vp.glsl (renamed from src/rend2/glsl/lightall_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/pshadow_fp.glsl (renamed from src/rend2/glsl/pshadow_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/pshadow_vp.glsl (renamed from src/rend2/glsl/pshadow_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/shadowfill_fp.glsl (renamed from src/rend2/glsl/shadowfill_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/shadowfill_vp.glsl (renamed from src/rend2/glsl/shadowfill_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/shadowmask_fp.glsl (renamed from src/rend2/glsl/shadowmask_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/shadowmask_vp.glsl (renamed from src/rend2/glsl/shadowmask_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/ssao_fp.glsl (renamed from src/rend2/glsl/ssao_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/ssao_vp.glsl (renamed from src/rend2/glsl/ssao_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/texturecolor_fp.glsl (renamed from src/rend2/glsl/texturecolor_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/texturecolor_vp.glsl (renamed from src/rend2/glsl/texturecolor_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/tonemap_fp.glsl (renamed from src/rend2/glsl/tonemap_fp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/glsl/tonemap_vp.glsl (renamed from src/rend2/glsl/tonemap_vp.glsl) | 0 | ||||
| -rw-r--r-- | src/renderergl2/qgl.h (renamed from src/rend2/qgl.h) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_animation.c (renamed from src/rend2/tr_animation.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_backend.c (renamed from src/rend2/tr_backend.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_bsp.c (renamed from src/rend2/tr_bsp.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_cmds.c (renamed from src/rend2/tr_cmds.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_curve.c (renamed from src/rend2/tr_curve.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_extensions.c (renamed from src/rend2/tr_extensions.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_extramath.c (renamed from src/rend2/tr_extramath.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_extramath.h (renamed from src/rend2/tr_extramath.h) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_extratypes.h (renamed from src/rend2/tr_extratypes.h) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_fbo.c (renamed from src/rend2/tr_fbo.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_fbo.h (renamed from src/rend2/tr_fbo.h) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_flares.c (renamed from src/rend2/tr_flares.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_font.c (renamed from src/rend2/tr_font.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_glsl.c (renamed from src/rend2/tr_glsl.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_image.c (renamed from src/rend2/tr_image.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_image_bmp.c (renamed from src/rend2/tr_image_bmp.c) | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_image_jpg.c (renamed from src/rend2/tr_image_jpg.c) | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_image_pcx.c (renamed from src/rend2/tr_image_pcx.c) | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_image_png.c (renamed from src/rend2/tr_image_png.c) | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_image_tga.c (renamed from src/rend2/tr_image_tga.c) | 2 | ||||
| -rw-r--r-- | src/renderergl2/tr_init.c (renamed from src/rend2/tr_init.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_light.c (renamed from src/rend2/tr_light.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_local.h (renamed from src/rend2/tr_local.h) | 4 | ||||
| -rw-r--r-- | src/renderergl2/tr_main.c (renamed from src/rend2/tr_main.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_marks.c (renamed from src/rend2/tr_marks.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_mesh.c (renamed from src/rend2/tr_mesh.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_model.c (renamed from src/rend2/tr_model.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_model_iqm.c (renamed from src/rend2/tr_model_iqm.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_noise.c (renamed from src/rend2/tr_noise.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_postprocess.c (renamed from src/rend2/tr_postprocess.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_postprocess.h (renamed from src/rend2/tr_postprocess.h) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_scene.c (renamed from src/rend2/tr_scene.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_shade.c (renamed from src/rend2/tr_shade.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_shade_calc.c (renamed from src/rend2/tr_shade_calc.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_shader.c (renamed from src/rend2/tr_shader.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_shadows.c (renamed from src/renderer/tr_shadows.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_sky.c (renamed from src/rend2/tr_sky.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_subs.c (renamed from src/renderer/tr_subs.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_surface.c (renamed from src/rend2/tr_surface.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_vbo.c (renamed from src/rend2/tr_vbo.c) | 0 | ||||
| -rw-r--r-- | src/renderergl2/tr_world.c (renamed from src/rend2/tr_world.c) | 0 | ||||
| -rw-r--r-- | src/sdl/sdl_gamma.c | 2 | ||||
| -rw-r--r-- | src/sdl/sdl_glimp.c | 3 |
110 files changed, 184 insertions, 183 deletions
@@ -38,8 +38,8 @@ endif ifndef BUILD_GAME_QVM BUILD_GAME_QVM = endif -ifndef BUILD_RENDERER_REND2 - BUILD_RENDERER_REND2= +ifndef BUILD_RENDERER_OPENGL2 + BUILD_RENDERER_OPENGL2= endif ############################################################################# @@ -198,8 +198,8 @@ BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH) BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH) CDIR=$(MOUNT_DIR)/client SDIR=$(MOUNT_DIR)/server -RDIR=$(MOUNT_DIR)/renderer -R2DIR=$(MOUNT_DIR)/rend2 +RGL1DIR=$(MOUNT_DIR)/renderergl1 +RGL2DIR=$(MOUNT_DIR)/renderergl2 CMDIR=$(MOUNT_DIR)/qcommon SDLDIR=$(MOUNT_DIR)/sdl ASMDIR=$(MOUNT_DIR)/asm @@ -834,13 +834,13 @@ endif ifneq ($(BUILD_CLIENT),0) ifneq ($(USE_RENDERER_DLOPEN),0) TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) $(B)/renderer_opengl1_$(SHLIBNAME) - ifneq ($(BUILD_RENDERER_REND2), 0) - TARGETS += $(B)/renderer_rend2_$(SHLIBNAME) + ifneq ($(BUILD_RENDERER_OPENGL2), 0) + TARGETS += $(B)/renderer_opengl2_$(SHLIBNAME) endif else TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) - ifneq ($(BUILD_RENDERER_REND2), 0) - TARGETS += $(B)/$(CLIENTBIN)_rend2$(FULLBINEXT) + ifneq ($(BUILD_RENDERER_OPENGL2), 0) + TARGETS += $(B)/$(CLIENTBIN)_opengl2$(FULLBINEXT) endif endif endif @@ -1108,9 +1108,9 @@ makedirs: @if [ ! -d $(BUILD_DIR) ];then $(MKDIR) $(BUILD_DIR);fi @if [ ! -d $(B) ];then $(MKDIR) $(B);fi @if [ ! -d $(B)/client ];then $(MKDIR) $(B)/client;fi - @if [ ! -d $(B)/renderer ];then $(MKDIR) $(B)/renderer;fi - @if [ ! -d $(B)/rend2 ];then $(MKDIR) $(B)/rend2;fi - @if [ ! -d $(B)/rend2/glsl ];then $(MKDIR) $(B)/rend2/glsl;fi + @if [ ! -d $(B)/renderergl1 ];then $(MKDIR) $(B)/renderergl1;fi + @if [ ! -d $(B)/renderergl2 ];then $(MKDIR) $(B)/renderergl2;fi + @if [ ! -d $(B)/renderergl2/glsl ];then $(MKDIR) $(B)/renderergl2/glsl;fi @if [ ! -d $(B)/ded ];then $(MKDIR) $(B)/ded;fi @if [ ! -d $(B)/$(BASEGAME) ];then $(MKDIR) $(B)/$(BASEGAME);fi @if [ ! -d $(B)/$(BASEGAME)/cgame ];then $(MKDIR) $(B)/$(BASEGAME)/cgame;fi @@ -1362,171 +1362,171 @@ else endif Q3R2OBJ = \ - $(B)/rend2/tr_animation.o \ - $(B)/rend2/tr_backend.o \ - $(B)/rend2/tr_bsp.o \ - $(B)/rend2/tr_cmds.o \ - $(B)/rend2/tr_curve.o \ - $(B)/rend2/tr_extramath.o \ - $(B)/rend2/tr_extensions.o \ - $(B)/rend2/tr_fbo.o \ - $(B)/rend2/tr_flares.o \ - $(B)/rend2/tr_font.o \ - $(B)/rend2/tr_glsl.o \ - $(B)/rend2/tr_image.o \ - $(B)/rend2/tr_image_png.o \ - $(B)/rend2/tr_image_jpg.o \ - $(B)/rend2/tr_image_bmp.o \ - $(B)/rend2/tr_image_tga.o \ - $(B)/rend2/tr_image_pcx.o \ - $(B)/rend2/tr_init.o \ - $(B)/rend2/tr_light.o \ - $(B)/rend2/tr_main.o \ - $(B)/rend2/tr_marks.o \ - $(B)/rend2/tr_mesh.o \ - $(B)/rend2/tr_model.o \ - $(B)/rend2/tr_model_iqm.o \ - $(B)/rend2/tr_noise.o \ - $(B)/rend2/tr_postprocess.o \ - $(B)/rend2/tr_scene.o \ - $(B)/rend2/tr_shade.o \ - $(B)/rend2/tr_shade_calc.o \ - $(B)/rend2/tr_shader.o \ - $(B)/rend2/tr_shadows.o \ - $(B)/rend2/tr_sky.o \ - $(B)/rend2/tr_surface.o \ - $(B)/rend2/tr_vbo.o \ - $(B)/rend2/tr_world.o \ + $(B)/renderergl2/tr_animation.o \ + $(B)/renderergl2/tr_backend.o \ + $(B)/renderergl2/tr_bsp.o \ + $(B)/renderergl2/tr_cmds.o \ + $(B)/renderergl2/tr_curve.o \ + $(B)/renderergl2/tr_extramath.o \ + $(B)/renderergl2/tr_extensions.o \ + $(B)/renderergl2/tr_fbo.o \ + $(B)/renderergl2/tr_flares.o \ + $(B)/renderergl2/tr_font.o \ + $(B)/renderergl2/tr_glsl.o \ + $(B)/renderergl2/tr_image.o \ + $(B)/renderergl2/tr_image_png.o \ + $(B)/renderergl2/tr_image_jpg.o \ + $(B)/renderergl2/tr_image_bmp.o \ + $(B)/renderergl2/tr_image_tga.o \ + $(B)/renderergl2/tr_image_pcx.o \ + $(B)/renderergl2/tr_init.o \ + $(B)/renderergl2/tr_light.o \ + $(B)/renderergl2/tr_main.o \ + $(B)/renderergl2/tr_marks.o \ + $(B)/renderergl2/tr_mesh.o \ + $(B)/renderergl2/tr_model.o \ + $(B)/renderergl2/tr_model_iqm.o \ + $(B)/renderergl2/tr_noise.o \ + $(B)/renderergl2/tr_postprocess.o \ + $(B)/renderergl2/tr_scene.o \ + $(B)/renderergl2/tr_shade.o \ + $(B)/renderergl2/tr_shade_calc.o \ + $(B)/renderergl2/tr_shader.o \ + $(B)/renderergl2/tr_shadows.o \ + $(B)/renderergl2/tr_sky.o \ + $(B)/renderergl2/tr_surface.o \ + $(B)/renderergl2/tr_vbo.o \ + $(B)/renderergl2/tr_world.o \ \ - $(B)/renderer/sdl_gamma.o \ - $(B)/renderer/sdl_glimp.o + $(B)/renderergl1/sdl_gamma.o \ + $(B)/renderergl1/sdl_glimp.o Q3R2STRINGOBJ = \ - $(B)/rend2/glsl/bokeh_fp.o \ - $(B)/rend2/glsl/bokeh_vp.o \ - $(B)/rend2/glsl/calclevels4x_fp.o \ - $(B)/rend2/glsl/calclevels4x_vp.o \ - $(B)/rend2/glsl/depthblur_fp.o \ - $(B)/rend2/glsl/depthblur_vp.o \ - $(B)/rend2/glsl/dlight_fp.o \ - $(B)/rend2/glsl/dlight_vp.o \ - $(B)/rend2/glsl/down4x_fp.o \ - $(B)/rend2/glsl/down4x_vp.o \ - $(B)/rend2/glsl/fogpass_fp.o \ - $(B)/rend2/glsl/fogpass_vp.o \ - $(B)/rend2/glsl/generic_fp.o \ - $(B)/rend2/glsl/generic_vp.o \ - $(B)/rend2/glsl/lightall_fp.o \ - $(B)/rend2/glsl/lightall_vp.o \ - $(B)/rend2/glsl/pshadow_fp.o \ - $(B)/rend2/glsl/pshadow_vp.o \ - $(B)/rend2/glsl/shadowfill_fp.o \ - $(B)/rend2/glsl/shadowfill_vp.o \ - $(B)/rend2/glsl/shadowmask_fp.o \ - $(B)/rend2/glsl/shadowmask_vp.o \ - $(B)/rend2/glsl/ssao_fp.o \ - $(B)/rend2/glsl/ssao_vp.o \ - $(B)/rend2/glsl/texturecolor_fp.o \ - $(B)/rend2/glsl/texturecolor_vp.o \ - $(B)/rend2/glsl/tonemap_fp.o \ - $(B)/rend2/glsl/tonemap_vp.o + $(B)/renderergl2/glsl/bokeh_fp.o \ + $(B)/renderergl2/glsl/bokeh_vp.o \ + $(B)/renderergl2/glsl/calclevels4x_fp.o \ + $(B)/renderergl2/glsl/calclevels4x_vp.o \ + $(B)/renderergl2/glsl/depthblur_fp.o \ + $(B)/renderergl2/glsl/depthblur_vp.o \ + $(B)/renderergl2/glsl/dlight_fp.o \ + $(B)/renderergl2/glsl/dlight_vp.o \ + $(B)/renderergl2/glsl/down4x_fp.o \ + $(B)/renderergl2/glsl/down4x_vp.o \ + $(B)/renderergl2/glsl/fogpass_fp.o \ + $(B)/renderergl2/glsl/fogpass_vp.o \ + $(B)/renderergl2/glsl/generic_fp.o \ + $(B)/renderergl2/glsl/generic_vp.o \ + $(B)/renderergl2/glsl/lightall_fp.o \ + $(B)/renderergl2/glsl/lightall_vp.o \ + $(B)/renderergl2/glsl/pshadow_fp.o \ + $(B)/renderergl2/glsl/pshadow_vp.o \ + $(B)/renderergl2/glsl/shadowfill_fp.o \ + $(B)/renderergl2/glsl/shadowfill_vp.o \ + $(B)/renderergl2/glsl/shadowmask_fp.o \ + $(B)/renderergl2/glsl/shadowmask_vp.o \ + $(B)/renderergl2/glsl/ssao_fp.o \ + $(B)/renderergl2/glsl/ssao_vp.o \ + $(B)/renderergl2/glsl/texturecolor_fp.o \ + $(B)/renderergl2/glsl/texturecolor_vp.o \ + $(B)/renderergl2/glsl/tonemap_fp.o \ + $(B)/renderergl2/glsl/tonemap_vp.o Q3ROBJ = \ - $(B)/renderer/tr_animation.o \ - $(B)/renderer/tr_backend.o \ - $(B)/renderer/tr_bsp.o \ - $(B)/renderer/tr_cmds.o \ - $(B)/renderer/tr_curve.o \ - $(B)/renderer/tr_flares.o \ - $(B)/renderer/tr_font.o \ - $(B)/renderer/tr_image.o \ - $(B)/renderer/tr_image_png.o \ - $(B)/renderer/tr_image_jpg.o \ - $(B)/renderer/tr_image_bmp.o \ - $(B)/renderer/tr_image_tga.o \ - $(B)/renderer/tr_image_pcx.o \ - $(B)/renderer/tr_init.o \ - $(B)/renderer/tr_light.o \ - $(B)/renderer/tr_main.o \ - $(B)/renderer/tr_marks.o \ - $(B)/renderer/tr_mesh.o \ - $(B)/renderer/tr_model.o \ - $(B)/renderer/tr_model_iqm.o \ - $(B)/renderer/tr_noise.o \ - $(B)/renderer/tr_scene.o \ - $(B)/renderer/tr_shade.o \ - $(B)/renderer/tr_shade_calc.o \ - $(B)/renderer/tr_shader.o \ - $(B)/renderer/tr_shadows.o \ - $(B)/renderer/tr_sky.o \ - $(B)/renderer/tr_surface.o \ - $(B)/renderer/tr_world.o \ + $(B)/renderergl1/tr_animation.o \ + $(B)/renderergl1/tr_backend.o \ + $(B)/renderergl1/tr_bsp.o \ + $(B)/renderergl1/tr_cmds.o \ + $(B)/renderergl1/tr_curve.o \ + $(B)/renderergl1/tr_flares.o \ + $(B)/renderergl1/tr_font.o \ + $(B)/renderergl1/tr_image.o \ + $(B)/renderergl1/tr_image_png.o \ + $(B)/renderergl1/tr_image_jpg.o \ + $(B)/renderergl1/tr_image_bmp.o \ + $(B)/renderergl1/tr_image_tga.o \ + $(B)/renderergl1/tr_image_pcx.o \ + $(B)/renderergl1/tr_init.o \ + $(B)/renderergl1/tr_light.o \ + $(B)/renderergl1/tr_main.o \ + $(B)/renderergl1/tr_marks.o \ + $(B)/renderergl1/tr_mesh.o \ + $(B)/renderergl1/tr_model.o \ + $(B)/renderergl1/tr_model_iqm.o \ + $(B)/renderergl1/tr_noise.o \ + $(B)/renderergl1/tr_scene.o \ + $(B)/renderergl1/tr_shade.o \ + $(B)/renderergl1/tr_shade_calc.o \ + $(B)/renderergl1/tr_shader.o \ + $(B)/renderergl1/tr_shadows.o \ + $(B)/renderergl1/tr_sky.o \ + $(B)/renderergl1/tr_surface.o \ + $(B)/renderergl1/tr_world.o \ \ - $(B)/renderer/sdl_gamma.o \ - $(B)/renderer/sdl_glimp.o + $(B)/renderergl1/sdl_gamma.o \ + $(B)/renderergl1/sdl_glimp.o ifneq ($(USE_RENDERER_DLOPEN), 0) Q3ROBJ += \ - $(B)/renderer/q_shared.o \ - $(B)/renderer/puff.o \ - $(B)/renderer/q_math.o \ - $(B)/renderer/tr_subs.o + $(B)/renderergl1/q_shared.o \ + $(B)/renderergl1/puff.o \ + $(B)/renderergl1/q_math.o \ + $(B)/renderergl1/tr_subs.o Q3R2OBJ += \ - $(B)/renderer/q_shared.o \ - $(B)/renderer/puff.o \ - $(B)/renderer/q_math.o \ - $(B)/renderer/tr_subs.o + $(B)/renderergl1/q_shared.o \ + $(B)/renderergl1/puff.o \ + $(B)/renderergl1/q_math.o \ + $(B)/renderergl1/tr_subs.o endif ifneq ($(USE_INTERNAL_JPEG),0) JPGOBJ = \ - $(B)/renderer/jaricom.o \ - $(B)/renderer/jcapimin.o \ - $(B)/renderer/jcapistd.o \ - $(B)/renderer/jcarith.o \ - $(B)/renderer/jccoefct.o \ - $(B)/renderer/jccolor.o \ - $(B)/renderer/jcdctmgr.o \ - $(B)/renderer/jchuff.o \ - $(B)/renderer/jcinit.o \ - $(B)/renderer/jcmainct.o \ - $(B)/renderer/jcmarker.o \ - $(B)/renderer/jcmaster.o \ - $(B)/renderer/jcomapi.o \ - $(B)/renderer/jcparam.o \ - $(B)/renderer/jcprepct.o \ - $(B)/renderer/jcsample.o \ - $(B)/renderer/jctrans.o \ - $(B)/renderer/jdapimin.o \ - $(B)/renderer/jdapistd.o \ - $(B)/renderer/jdarith.o \ - $(B)/renderer/jdatadst.o \ - $(B)/renderer/jdatasrc.o \ - $(B)/renderer/jdcoefct.o \ - $(B)/renderer/jdcolor.o \ - $(B)/renderer/jddctmgr.o \ - $(B)/renderer/jdhuff.o \ - $(B)/renderer/jdinput.o \ - $(B)/renderer/jdmainct.o \ - $(B)/renderer/jdmarker.o \ - $(B)/renderer/jdmaster.o \ - $(B)/renderer/jdmerge.o \ - $(B)/renderer/jdpostct.o \ - $(B)/renderer/jdsample.o \ - $(B)/renderer/jdtrans.o \ - $(B)/renderer/jerror.o \ - $(B)/renderer/jfdctflt.o \ - $(B)/renderer/jfdctfst.o \ - $(B)/renderer/jfdctint.o \ - $(B)/renderer/jidctflt.o \ - $(B)/renderer/jidctfst.o \ - $(B)/renderer/jidctint.o \ - $(B)/renderer/jmemmgr.o \ - $(B)/renderer/jmemnobs.o \ - $(B)/renderer/jquant1.o \ - $(B)/renderer/jquant2.o \ - $(B)/renderer/jutils.o + $(B)/renderergl1/jaricom.o \ + $(B)/renderergl1/jcapimin.o \ + $(B)/renderergl1/jcapistd.o \ + $(B)/renderergl1/jcarith.o \ + $(B)/renderergl1/jccoefct.o \ + $(B)/renderergl1/jccolor.o \ + $(B)/renderergl1/jcdctmgr.o \ + $(B)/renderergl1/jchuff.o \ + $(B)/renderergl1/jcinit.o \ + $(B)/renderergl1/jcmainct.o \ + $(B)/renderergl1/jcmarker.o \ + $(B)/renderergl1/jcmaster.o \ + $(B)/renderergl1/jcomapi.o \ + $(B)/renderergl1/jcparam.o \ + $(B)/renderergl1/jcprepct.o \ + $(B)/renderergl1/jcsample.o \ + $(B)/renderergl1/jctrans.o \ + $(B)/renderergl1/jdapimin.o \ + $(B)/renderergl1/jdapistd.o \ + $(B)/renderergl1/jdarith.o \ + $(B)/renderergl1/jdatadst.o \ + $(B)/renderergl1/jdatasrc.o \ + $(B)/renderergl1/jdcoefct.o \ + $(B)/renderergl1/jdcolor.o \ + $(B)/renderergl1/jddctmgr.o \ + $(B)/renderergl1/jdhuff.o \ + $(B)/renderergl1/jdinput.o \ + $(B)/renderergl1/jdmainct.o \ + $(B)/renderergl1/jdmarker.o \ + $(B)/renderergl1/jdmaster.o \ + $(B)/renderergl1/jdmerge.o \ + $(B)/renderergl1/jdpostct.o \ + $(B)/renderergl1/jdsample.o \ + $(B)/renderergl1/jdtrans.o \ + $(B)/renderergl1/jerror.o \ + $(B)/renderergl1/jfdctflt.o \ + $(B)/renderergl1/jfdctfst.o \ + $(B)/renderergl1/jfdctint.o \ + $(B)/renderergl1/jidctflt.o \ + $(B)/renderergl1/jidctfst.o \ + $(B)/renderergl1/jidctint.o \ + $(B)/renderergl1/jmemmgr.o \ + $(B)/renderergl1/jmemnobs.o \ + $(B)/renderergl1/jquant1.o \ + $(B)/renderergl1/jquant2.o \ + $(B)/renderergl1/jutils.o endif ifeq ($(ARCH),x86) @@ -1685,7 +1685,7 @@ $(B)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(JPGOBJ) $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) -$(B)/renderer_rend2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) +$(B)/renderer_opengl2_$(SHLIBNAME): $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(echo_cmd) "LD $@" $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \ $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) @@ -1696,7 +1696,7 @@ $(B)/$(CLIENTBIN)$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) $(LIBSDLMAIN) -o $@ $(Q3OBJ) $(Q3ROBJ) $(JPGOBJ) \ $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) -$(B)/$(CLIENTBIN)_rend2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(LIBSDLMAIN) +$(B)/$(CLIENTBIN)_opengl2$(FULLBINEXT): $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \ -o $@ $(Q3OBJ) $(Q3R2OBJ) $(Q3R2STRINGOBJ) $(JPGOBJ) \ @@ -2025,25 +2025,25 @@ $(B)/client/%.o: $(SYSDIR)/%.rc $(DO_WINDRES) -$(B)/renderer/%.o: $(CMDIR)/%.c +$(B)/renderergl1/%.o: $(CMDIR)/%.c $(DO_REF_CC) -$(B)/renderer/%.o: $(SDLDIR)/%.c +$(B)/renderergl1/%.o: $(SDLDIR)/%.c $(DO_REF_CC) -$(B)/renderer/%.o: $(JPDIR)/%.c +$(B)/renderergl1/%.o: $(JPDIR)/%.c $(DO_REF_CC) -$(B)/renderer/%.o: $(RDIR)/%.c +$(B)/renderergl1/%.o: $(RGL1DIR)/%.c $(DO_REF_CC) -$(B)/rend2/glsl/%.c: $(R2DIR)/glsl/%.glsl +$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(DO_REF_STR) -$(B)/rend2/glsl/%.o: $(B)/rend2/glsl/%.c +$(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c $(DO_REF_CC) -$(B)/rend2/%.o: $(R2DIR)/%.c +$(B)/renderergl2/%.o: $(RGL2DIR)/%.c $(DO_REF_CC) diff --git a/src/client/client.h b/src/client/client.h index f3d52a24..de029364 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" #include "../ui/ui_public.h" #include "keys.h" #include "snd_public.h" diff --git a/src/null/null_glimp.c b/src/null/null_glimp.c index aae34eb0..f33508d9 100644 --- a/src/null/null_glimp.c +++ b/src/null/null_glimp.c @@ -20,7 +20,7 @@ along with Tremulous; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../renderer/tr_local.h" +#include "../renderergl1/tr_local.h" qboolean ( * qwglSwapIntervalEXT)( int interval ); diff --git a/src/renderer/iqm.h b/src/renderercommon/iqm.h index ab2247ac..ab2247ac 100644 --- a/src/renderer/iqm.h +++ b/src/renderercommon/iqm.h diff --git a/src/renderer/tr_public.h b/src/renderercommon/tr_public.h index f9ededdf..f9ededdf 100644 --- a/src/renderer/tr_public.h +++ b/src/renderercommon/tr_public.h diff --git a/src/renderer/tr_types.h b/src/renderercommon/tr_types.h index 0e15c9e8..0e15c9e8 100644 --- a/src/renderer/tr_types.h +++ b/src/renderercommon/tr_types.h diff --git a/src/renderer/qgl.h b/src/renderergl1/qgl.h index 2dbe27db..2dbe27db 100644 --- a/src/renderer/qgl.h +++ b/src/renderergl1/qgl.h diff --git a/src/renderer/tr_animation.c b/src/renderergl1/tr_animation.c index a9bcd507..a9bcd507 100644 --- a/src/renderer/tr_animation.c +++ b/src/renderergl1/tr_animation.c diff --git a/src/renderer/tr_backend.c b/src/renderergl1/tr_backend.c index 61495083..61495083 100644 --- a/src/renderer/tr_backend.c +++ b/src/renderergl1/tr_backend.c diff --git a/src/renderer/tr_bsp.c b/src/renderergl1/tr_bsp.c index 74596a53..74596a53 100644 --- a/src/renderer/tr_bsp.c +++ b/src/renderergl1/tr_bsp.c diff --git a/src/renderer/tr_cmds.c b/src/renderergl1/tr_cmds.c index e4a2dcfe..e4a2dcfe 100644 --- a/src/renderer/tr_cmds.c +++ b/src/renderergl1/tr_cmds.c diff --git a/src/renderer/tr_curve.c b/src/renderergl1/tr_curve.c index 684329b1..684329b1 100644 --- a/src/renderer/tr_curve.c +++ b/src/renderergl1/tr_curve.c diff --git a/src/renderer/tr_flares.c b/src/renderergl1/tr_flares.c index 9397fbac..9397fbac 100644 --- a/src/renderer/tr_flares.c +++ b/src/renderergl1/tr_flares.c diff --git a/src/renderer/tr_font.c b/src/renderergl1/tr_font.c index 432d1215..432d1215 100644 --- a/src/renderer/tr_font.c +++ b/src/renderergl1/tr_font.c diff --git a/src/renderer/tr_image.c b/src/renderergl1/tr_image.c index 3338a25b..3338a25b 100644 --- a/src/renderer/tr_image.c +++ b/src/renderergl1/tr_image.c diff --git a/src/renderer/tr_image_bmp.c b/src/renderergl1/tr_image_bmp.c index eed62c58..eed62c58 100644 --- a/src/renderer/tr_image_bmp.c +++ b/src/renderergl1/tr_image_bmp.c diff --git a/src/renderer/tr_image_jpg.c b/src/renderergl1/tr_image_jpg.c index 7d4a793a..7d4a793a 100644 --- a/src/renderer/tr_image_jpg.c +++ b/src/renderergl1/tr_image_jpg.c diff --git a/src/renderer/tr_image_pcx.c b/src/renderergl1/tr_image_pcx.c index 8837d5b7..8837d5b7 100644 --- a/src/renderer/tr_image_pcx.c +++ b/src/renderergl1/tr_image_pcx.c diff --git a/src/renderer/tr_image_png.c b/src/renderergl1/tr_image_png.c index b30c7fea..b30c7fea 100644 --- a/src/renderer/tr_image_png.c +++ b/src/renderergl1/tr_image_png.c diff --git a/src/renderer/tr_image_tga.c b/src/renderergl1/tr_image_tga.c index b707c0ed..b707c0ed 100644 --- a/src/renderer/tr_image_tga.c +++ b/src/renderergl1/tr_image_tga.c diff --git a/src/renderer/tr_init.c b/src/renderergl1/tr_init.c index 14b91927..14b91927 100644 --- a/src/renderer/tr_init.c +++ b/src/renderergl1/tr_init.c diff --git a/src/renderer/tr_light.c b/src/renderergl1/tr_light.c index 36c1c480..36c1c480 100644 --- a/src/renderer/tr_light.c +++ b/src/renderergl1/tr_light.c diff --git a/src/renderer/tr_local.h b/src/renderergl1/tr_local.h index fc80645b..3e6766f8 100644 --- a/src/renderer/tr_local.h +++ b/src/renderergl1/tr_local.h @@ -28,9 +28,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "tr_public.h" +#include "../renderercommon/tr_public.h" #include "qgl.h" -#include "iqm.h" +#include "../renderercommon/iqm.h" #define GL_INDEX_TYPE GL_UNSIGNED_INT typedef unsigned int glIndex_t; diff --git a/src/renderer/tr_main.c b/src/renderergl1/tr_main.c index 3b82a777..3b82a777 100644 --- a/src/renderer/tr_main.c +++ b/src/renderergl1/tr_main.c diff --git a/src/renderer/tr_marks.c b/src/renderergl1/tr_marks.c index 6bcd7cb1..6bcd7cb1 100644 --- a/src/renderer/tr_marks.c +++ b/src/renderergl1/tr_marks.c diff --git a/src/renderer/tr_mesh.c b/src/renderergl1/tr_mesh.c index effbae01..effbae01 100644 --- a/src/renderer/tr_mesh.c +++ b/src/renderergl1/tr_mesh.c diff --git a/src/renderer/tr_model.c b/src/renderergl1/tr_model.c index b51c3ce1..b51c3ce1 100644 --- a/src/renderer/tr_model.c +++ b/src/renderergl1/tr_model.c diff --git a/src/renderer/tr_model_iqm.c b/src/renderergl1/tr_model_iqm.c index 98517d55..98517d55 100644 --- a/src/renderer/tr_model_iqm.c +++ b/src/renderergl1/tr_model_iqm.c diff --git a/src/renderer/tr_noise.c b/src/renderergl1/tr_noise.c index b4c4082d..b4c4082d 100644 --- a/src/renderer/tr_noise.c +++ b/src/renderergl1/tr_noise.c diff --git a/src/renderer/tr_scene.c b/src/renderergl1/tr_scene.c index 6ee77dc6..6ee77dc6 100644 --- a/src/renderer/tr_scene.c +++ b/src/renderergl1/tr_scene.c diff --git a/src/renderer/tr_shade.c b/src/renderergl1/tr_shade.c index b8e8d268..b8e8d268 100644 --- a/src/renderer/tr_shade.c +++ b/src/renderergl1/tr_shade.c diff --git a/src/renderer/tr_shade_calc.c b/src/renderergl1/tr_shade_calc.c index 58ec6f45..58ec6f45 100644 --- a/src/renderer/tr_shade_calc.c +++ b/src/renderergl1/tr_shade_calc.c diff --git a/src/renderer/tr_shader.c b/src/renderergl1/tr_shader.c index 8440dd63..8440dd63 100644 --- a/src/renderer/tr_shader.c +++ b/src/renderergl1/tr_shader.c diff --git a/src/rend2/tr_shadows.c b/src/renderergl1/tr_shadows.c index f412b00d..f412b00d 100644 --- a/src/rend2/tr_shadows.c +++ b/src/renderergl1/tr_shadows.c diff --git a/src/renderer/tr_sky.c b/src/renderergl1/tr_sky.c index 3b90fdeb..3b90fdeb 100644 --- a/src/renderer/tr_sky.c +++ b/src/renderergl1/tr_sky.c diff --git a/src/rend2/tr_subs.c b/src/renderergl1/tr_subs.c index 6f490128..6f490128 100644 --- a/src/rend2/tr_subs.c +++ b/src/renderergl1/tr_subs.c diff --git a/src/renderer/tr_surface.c b/src/renderergl1/tr_surface.c index 7a836386..7a836386 100644 --- a/src/renderer/tr_surface.c +++ b/src/renderergl1/tr_surface.c diff --git a/src/renderer/tr_world.c b/src/renderergl1/tr_world.c index de9715a8..de9715a8 100644 --- a/src/renderer/tr_world.c +++ b/src/renderergl1/tr_world.c diff --git a/src/rend2/glsl/bokeh_fp.glsl b/src/renderergl2/glsl/bokeh_fp.glsl index d08816ae..d08816ae 100644 --- a/src/rend2/glsl/bokeh_fp.glsl +++ b/src/renderergl2/glsl/bokeh_fp.glsl diff --git a/src/rend2/glsl/bokeh_vp.glsl b/src/renderergl2/glsl/bokeh_vp.glsl index 5ca41600..5ca41600 100644 --- a/src/rend2/glsl/bokeh_vp.glsl +++ b/src/renderergl2/glsl/bokeh_vp.glsl diff --git a/src/rend2/glsl/calclevels4x_fp.glsl b/src/renderergl2/glsl/calclevels4x_fp.glsl index c8cf06c7..c8cf06c7 100644 --- a/src/rend2/glsl/calclevels4x_fp.glsl +++ b/src/renderergl2/glsl/calclevels4x_fp.glsl diff --git a/src/rend2/glsl/calclevels4x_vp.glsl b/src/renderergl2/glsl/calclevels4x_vp.glsl index 5ca41600..5ca41600 100644 --- a/src/rend2/glsl/calclevels4x_vp.glsl +++ b/src/renderergl2/glsl/calclevels4x_vp.glsl diff --git a/src/rend2/glsl/depthblur_fp.glsl b/src/renderergl2/glsl/depthblur_fp.glsl index 93895b4e..93895b4e 100644 --- a/src/rend2/glsl/depthblur_fp.glsl +++ b/src/renderergl2/glsl/depthblur_fp.glsl diff --git a/src/rend2/glsl/depthblur_vp.glsl b/src/renderergl2/glsl/depthblur_vp.glsl index 9c46a79f..9c46a79f 100644 --- a/src/rend2/glsl/depthblur_vp.glsl +++ b/src/renderergl2/glsl/depthblur_vp.glsl diff --git a/src/rend2/glsl/dlight_fp.glsl b/src/renderergl2/glsl/dlight_fp.glsl index 8ffca5b9..8ffca5b9 100644 --- a/src/rend2/glsl/dlight_fp.glsl +++ b/src/renderergl2/glsl/dlight_fp.glsl diff --git a/src/rend2/glsl/dlight_vp.glsl b/src/renderergl2/glsl/dlight_vp.glsl index d9fd71d0..d9fd71d0 100644 --- a/src/rend2/glsl/dlight_vp.glsl +++ b/src/renderergl2/glsl/dlight_vp.glsl diff --git a/src/rend2/glsl/down4x_fp.glsl b/src/renderergl2/glsl/down4x_fp.glsl index 0f88fb2e..0f88fb2e 100644 --- a/src/rend2/glsl/down4x_fp.glsl +++ b/src/renderergl2/glsl/down4x_fp.glsl diff --git a/src/rend2/glsl/down4x_vp.glsl b/src/renderergl2/glsl/down4x_vp.glsl index 5ca41600..5ca41600 100644 --- a/src/rend2/glsl/down4x_vp.glsl +++ b/src/renderergl2/glsl/down4x_vp.glsl diff --git a/src/rend2/glsl/fogpass_fp.glsl b/src/renderergl2/glsl/fogpass_fp.glsl index 91884304..91884304 100644 --- a/src/rend2/glsl/fogpass_fp.glsl +++ b/src/renderergl2/glsl/fogpass_fp.glsl diff --git a/src/rend2/glsl/fogpass_vp.glsl b/src/renderergl2/glsl/fogpass_vp.glsl index f18bc707..f18bc707 100644 --- a/src/rend2/glsl/fogpass_vp.glsl +++ b/src/renderergl2/glsl/fogpass_vp.glsl diff --git a/src/rend2/glsl/generic_fp.glsl b/src/renderergl2/glsl/generic_fp.glsl index dea52e06..dea52e06 100644 --- a/src/rend2/glsl/generic_fp.glsl +++ b/src/renderergl2/glsl/generic_fp.glsl diff --git a/src/rend2/glsl/generic_vp.glsl b/src/renderergl2/glsl/generic_vp.glsl index 67360b1b..67360b1b 100644 --- a/src/rend2/glsl/generic_vp.glsl +++ b/src/renderergl2/glsl/generic_vp.glsl diff --git a/src/rend2/glsl/lightall_fp.glsl b/src/renderergl2/glsl/lightall_fp.glsl index ec9bb2dc..ec9bb2dc 100644 --- a/src/rend2/glsl/lightall_fp.glsl +++ b/src/renderergl2/glsl/lightall_fp.glsl diff --git a/src/rend2/glsl/lightall_vp.glsl b/src/renderergl2/glsl/lightall_vp.glsl index 05a41f4d..05a41f4d 100644 --- a/src/rend2/glsl/lightall_vp.glsl +++ b/src/renderergl2/glsl/lightall_vp.glsl diff --git a/src/rend2/glsl/pshadow_fp.glsl b/src/renderergl2/glsl/pshadow_fp.glsl index b152971a..b152971a 100644 --- a/src/rend2/glsl/pshadow_fp.glsl +++ b/src/renderergl2/glsl/pshadow_fp.glsl diff --git a/src/rend2/glsl/pshadow_vp.glsl b/src/renderergl2/glsl/pshadow_vp.glsl index 0e0e3b3d..0e0e3b3d 100644 --- a/src/rend2/glsl/pshadow_vp.glsl +++ b/src/renderergl2/glsl/pshadow_vp.glsl diff --git a/src/rend2/glsl/shadowfill_fp.glsl b/src/renderergl2/glsl/shadowfill_fp.glsl index 150f3d12..150f3d12 100644 --- a/src/rend2/glsl/shadowfill_fp.glsl +++ b/src/renderergl2/glsl/shadowfill_fp.glsl diff --git a/src/rend2/glsl/shadowfill_vp.glsl b/src/renderergl2/glsl/shadowfill_vp.glsl index 10802eca..10802eca 100644 --- a/src/rend2/glsl/shadowfill_vp.glsl +++ b/src/renderergl2/glsl/shadowfill_vp.glsl diff --git a/src/rend2/glsl/shadowmask_fp.glsl b/src/renderergl2/glsl/shadowmask_fp.glsl index b3a698c8..b3a698c8 100644 --- a/src/rend2/glsl/shadowmask_fp.glsl +++ b/src/renderergl2/glsl/shadowmask_fp.glsl diff --git a/src/rend2/glsl/shadowmask_vp.glsl b/src/renderergl2/glsl/shadowmask_vp.glsl index 13166a24..13166a24 100644 --- a/src/rend2/glsl/shadowmask_vp.glsl +++ b/src/renderergl2/glsl/shadowmask_vp.glsl diff --git a/src/rend2/glsl/ssao_fp.glsl b/src/renderergl2/glsl/ssao_fp.glsl index 6263284c..6263284c 100644 --- a/src/rend2/glsl/ssao_fp.glsl +++ b/src/renderergl2/glsl/ssao_fp.glsl diff --git a/src/rend2/glsl/ssao_vp.glsl b/src/renderergl2/glsl/ssao_vp.glsl index 9c46a79f..9c46a79f 100644 --- a/src/rend2/glsl/ssao_vp.glsl +++ b/src/renderergl2/glsl/ssao_vp.glsl diff --git a/src/rend2/glsl/texturecolor_fp.glsl b/src/renderergl2/glsl/texturecolor_fp.glsl index 5646b511..5646b511 100644 --- a/src/rend2/glsl/texturecolor_fp.glsl +++ b/src/renderergl2/glsl/texturecolor_fp.glsl diff --git a/src/rend2/glsl/texturecolor_vp.glsl b/src/renderergl2/glsl/texturecolor_vp.glsl index ae26a18e..ae26a18e 100644 --- a/src/rend2/glsl/texturecolor_vp.glsl +++ b/src/renderergl2/glsl/texturecolor_vp.glsl diff --git a/src/rend2/glsl/tonemap_fp.glsl b/src/renderergl2/glsl/tonemap_fp.glsl index 9b18de8a..9b18de8a 100644 --- a/src/rend2/glsl/tonemap_fp.glsl +++ b/src/renderergl2/glsl/tonemap_fp.glsl diff --git a/src/rend2/glsl/tonemap_vp.glsl b/src/renderergl2/glsl/tonemap_vp.glsl index 5ca41600..5ca41600 100644 --- a/src/rend2/glsl/tonemap_vp.glsl +++ b/src/renderergl2/glsl/tonemap_vp.glsl diff --git a/src/rend2/qgl.h b/src/renderergl2/qgl.h index 6013a87c..6013a87c 100644 --- a/src/rend2/qgl.h +++ b/src/renderergl2/qgl.h diff --git a/src/rend2/tr_animation.c b/src/renderergl2/tr_animation.c index 794111c6..794111c6 100644 --- a/src/rend2/tr_animation.c +++ b/src/renderergl2/tr_animation.c diff --git a/src/rend2/tr_backend.c b/src/renderergl2/tr_backend.c index fd61ee76..fd61ee76 100644 --- a/src/rend2/tr_backend.c +++ b/src/renderergl2/tr_backend.c diff --git a/src/rend2/tr_bsp.c b/src/renderergl2/tr_bsp.c index c14245b8..c14245b8 100644 --- a/src/rend2/tr_bsp.c +++ b/src/renderergl2/tr_bsp.c diff --git a/src/rend2/tr_cmds.c b/src/renderergl2/tr_cmds.c index 622b401a..622b401a 100644 --- a/src/rend2/tr_cmds.c +++ b/src/renderergl2/tr_cmds.c diff --git a/src/rend2/tr_curve.c b/src/renderergl2/tr_curve.c index 3d439257..3d439257 100644 --- a/src/rend2/tr_curve.c +++ b/src/renderergl2/tr_curve.c diff --git a/src/rend2/tr_extensions.c b/src/renderergl2/tr_extensions.c index 0b70d48b..0b70d48b 100644 --- a/src/rend2/tr_extensions.c +++ b/src/renderergl2/tr_extensions.c diff --git a/src/rend2/tr_extramath.c b/src/renderergl2/tr_extramath.c index e989c7e9..e989c7e9 100644 --- a/src/rend2/tr_extramath.c +++ b/src/renderergl2/tr_extramath.c diff --git a/src/rend2/tr_extramath.h b/src/renderergl2/tr_extramath.h index b4ca6f3c..b4ca6f3c 100644 --- a/src/rend2/tr_extramath.h +++ b/src/renderergl2/tr_extramath.h diff --git a/src/rend2/tr_extratypes.h b/src/renderergl2/tr_extratypes.h index b84cd5e4..b84cd5e4 100644 --- a/src/rend2/tr_extratypes.h +++ b/src/renderergl2/tr_extratypes.h diff --git a/src/rend2/tr_fbo.c b/src/renderergl2/tr_fbo.c index 0ad08b20..0ad08b20 100644 --- a/src/rend2/tr_fbo.c +++ b/src/renderergl2/tr_fbo.c diff --git a/src/rend2/tr_fbo.h b/src/renderergl2/tr_fbo.h index f0366251..f0366251 100644 --- a/src/rend2/tr_fbo.h +++ b/src/renderergl2/tr_fbo.h diff --git a/src/rend2/tr_flares.c b/src/renderergl2/tr_flares.c index 8e6c321f..8e6c321f 100644 --- a/src/rend2/tr_flares.c +++ b/src/renderergl2/tr_flares.c diff --git a/src/rend2/tr_font.c b/src/renderergl2/tr_font.c index 21226709..21226709 100644 --- a/src/rend2/tr_font.c +++ b/src/renderergl2/tr_font.c diff --git a/src/rend2/tr_glsl.c b/src/renderergl2/tr_glsl.c index ccfea909..ccfea909 100644 --- a/src/rend2/tr_glsl.c +++ b/src/renderergl2/tr_glsl.c diff --git a/src/rend2/tr_image.c b/src/renderergl2/tr_image.c index 8a1f574f..8a1f574f 100644 --- a/src/rend2/tr_image.c +++ b/src/renderergl2/tr_image.c diff --git a/src/rend2/tr_image_bmp.c b/src/renderergl2/tr_image_bmp.c index 707bee3b..87ea9e4a 100644 --- a/src/rend2/tr_image_bmp.c +++ b/src/renderergl2/tr_image_bmp.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" extern refimport_t ri; typedef struct diff --git a/src/rend2/tr_image_jpg.c b/src/renderergl2/tr_image_jpg.c index 494b4a28..fb769263 100644 --- a/src/rend2/tr_image_jpg.c +++ b/src/renderergl2/tr_image_jpg.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" extern refimport_t ri; /* diff --git a/src/rend2/tr_image_pcx.c b/src/renderergl2/tr_image_pcx.c index d4dd575d..5e1de51b 100644 --- a/src/rend2/tr_image_pcx.c +++ b/src/renderergl2/tr_image_pcx.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" extern refimport_t ri; /* diff --git a/src/rend2/tr_image_png.c b/src/renderergl2/tr_image_png.c index ee37aa75..a0729c39 100644 --- a/src/rend2/tr_image_png.c +++ b/src/renderergl2/tr_image_png.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" extern refimport_t ri; #include "../qcommon/puff.h" diff --git a/src/rend2/tr_image_tga.c b/src/renderergl2/tr_image_tga.c index 27ca0d7b..363c0b3f 100644 --- a/src/rend2/tr_image_tga.c +++ b/src/renderergl2/tr_image_tga.c @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" extern refimport_t ri; /* diff --git a/src/rend2/tr_init.c b/src/renderergl2/tr_init.c index 7228d01b..7228d01b 100644 --- a/src/rend2/tr_init.c +++ b/src/renderergl2/tr_init.c diff --git a/src/rend2/tr_light.c b/src/renderergl2/tr_light.c index 4e90ce20..4e90ce20 100644 --- a/src/rend2/tr_light.c +++ b/src/renderergl2/tr_light.c diff --git a/src/rend2/tr_local.h b/src/renderergl2/tr_local.h index a5d57d35..dd0b62d1 100644 --- a/src/rend2/tr_local.h +++ b/src/renderergl2/tr_local.h @@ -27,13 +27,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" #include "../qcommon/qfiles.h" #include "../qcommon/qcommon.h" -#include "../renderer/tr_public.h" +#include "../renderercommon/tr_public.h" #include "tr_extratypes.h" #include "tr_extramath.h" #include "tr_fbo.h" #include "tr_postprocess.h" #include "qgl.h" -#include "../renderer/iqm.h" +#include "../renderercommon/iqm.h" #define GL_INDEX_TYPE GL_UNSIGNED_INT typedef unsigned int glIndex_t; diff --git a/src/rend2/tr_main.c b/src/renderergl2/tr_main.c index 0935dce7..0935dce7 100644 --- a/src/rend2/tr_main.c +++ b/src/renderergl2/tr_main.c diff --git a/src/rend2/tr_marks.c b/src/renderergl2/tr_marks.c index f24459e2..f24459e2 100644 --- a/src/rend2/tr_marks.c +++ b/src/renderergl2/tr_marks.c diff --git a/src/rend2/tr_mesh.c b/src/renderergl2/tr_mesh.c index 342854bf..342854bf 100644 --- a/src/rend2/tr_mesh.c +++ b/src/renderergl2/tr_mesh.c diff --git a/src/rend2/tr_model.c b/src/renderergl2/tr_model.c index 5aeab8ef..5aeab8ef 100644 --- a/src/rend2/tr_model.c +++ b/src/renderergl2/tr_model.c diff --git a/src/rend2/tr_model_iqm.c b/src/renderergl2/tr_model_iqm.c index 1f1bf747..1f1bf747 100644 --- a/src/rend2/tr_model_iqm.c +++ b/src/renderergl2/tr_model_iqm.c diff --git a/src/rend2/tr_noise.c b/src/renderergl2/tr_noise.c index 40eafc33..40eafc33 100644 --- a/src/rend2/tr_noise.c +++ b/src/renderergl2/tr_noise.c diff --git a/src/rend2/tr_postprocess.c b/src/renderergl2/tr_postprocess.c index a15c9b7a..a15c9b7a 100644 --- a/src/rend2/tr_postprocess.c +++ b/src/renderergl2/tr_postprocess.c diff --git a/src/rend2/tr_postprocess.h b/src/renderergl2/tr_postprocess.h index 1e5ebefe..1e5ebefe 100644 --- a/src/rend2/tr_postprocess.h +++ b/src/renderergl2/tr_postprocess.h diff --git a/src/rend2/tr_scene.c b/src/renderergl2/tr_scene.c index 14c18339..14c18339 100644 --- a/src/rend2/tr_scene.c +++ b/src/renderergl2/tr_scene.c diff --git a/src/rend2/tr_shade.c b/src/renderergl2/tr_shade.c index b4758a86..b4758a86 100644 --- a/src/rend2/tr_shade.c +++ b/src/renderergl2/tr_shade.c diff --git a/src/rend2/tr_shade_calc.c b/src/renderergl2/tr_shade_calc.c index 9421f646..9421f646 100644 --- a/src/rend2/tr_shade_calc.c +++ b/src/renderergl2/tr_shade_calc.c diff --git a/src/rend2/tr_shader.c b/src/renderergl2/tr_shader.c index 8cad4b6b..8cad4b6b 100644 --- a/src/rend2/tr_shader.c +++ b/src/renderergl2/tr_shader.c diff --git a/src/renderer/tr_shadows.c b/src/renderergl2/tr_shadows.c index 04777799..04777799 100644 --- a/src/renderer/tr_shadows.c +++ b/src/renderergl2/tr_shadows.c diff --git a/src/rend2/tr_sky.c b/src/renderergl2/tr_sky.c index f3c24a45..f3c24a45 100644 --- a/src/rend2/tr_sky.c +++ b/src/renderergl2/tr_sky.c diff --git a/src/renderer/tr_subs.c b/src/renderergl2/tr_subs.c index 6f490128..6f490128 100644 --- a/src/renderer/tr_subs.c +++ b/src/renderergl2/tr_subs.c diff --git a/src/rend2/tr_surface.c b/src/renderergl2/tr_surface.c index ad7f5a5f..ad7f5a5f 100644 --- a/src/rend2/tr_surface.c +++ b/src/renderergl2/tr_surface.c diff --git a/src/rend2/tr_vbo.c b/src/renderergl2/tr_vbo.c index 483df2e3..483df2e3 100644 --- a/src/rend2/tr_vbo.c +++ b/src/renderergl2/tr_vbo.c diff --git a/src/rend2/tr_world.c b/src/renderergl2/tr_world.c index 950ee6a4..950ee6a4 100644 --- a/src/rend2/tr_world.c +++ b/src/renderergl2/tr_world.c diff --git a/src/sdl/sdl_gamma.c b/src/sdl/sdl_gamma.c index 53dc4026..c341746a 100644 --- a/src/sdl/sdl_gamma.c +++ b/src/sdl/sdl_gamma.c @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # include <SDL.h> #endif -#include "../renderer/tr_local.h" +#include "../renderergl1/tr_local.h" #include "../qcommon/qcommon.h" /* diff --git a/src/sdl/sdl_glimp.c b/src/sdl/sdl_glimp.c index f9c2ce87..4cc0afa6 100644 --- a/src/sdl/sdl_glimp.c +++ b/src/sdl/sdl_glimp.c @@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include <stdlib.h> #include <math.h> -#include "../renderer/tr_local.h" +//FIXME: factor out the bits that are actually needed here into a renderercommon header +#include "../renderergl1/tr_local.h" #include "../sys/sys_local.h" #include "sdl_icon.h" |