From f6fb9eb602758308ea63976bc4119ba3436cb017 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Fri, 15 Feb 2013 23:46:37 +0000 Subject: [PATCH] renderer -> renderergl1, rend2 -> renderergl2 --- Makefile | 344 +++--- code/cgame/cg_local.h | 2 +- code/client/client.h | 2 +- code/null/null_glimp.c | 2 +- code/q3_ui/ui_local.h | 2 +- code/{renderer => renderercommon}/iqm.h | 0 code/{renderer => renderercommon}/tr_public.h | 0 code/{renderer => renderercommon}/tr_types.h | 0 code/{renderer => renderergl1}/qgl.h | 0 code/{renderer => renderergl1}/tr_animation.c | 0 code/{renderer => renderergl1}/tr_backend.c | 0 code/{renderer => renderergl1}/tr_bsp.c | 0 code/{renderer => renderergl1}/tr_cmds.c | 0 code/{renderer => renderergl1}/tr_curve.c | 0 code/{renderer => renderergl1}/tr_flares.c | 0 code/{renderer => renderergl1}/tr_font.c | 0 code/{renderer => renderergl1}/tr_image.c | 0 code/{renderer => renderergl1}/tr_image_bmp.c | 0 code/{renderer => renderergl1}/tr_image_jpg.c | 0 code/{renderer => renderergl1}/tr_image_pcx.c | 0 code/{renderer => renderergl1}/tr_image_png.c | 0 code/{renderer => renderergl1}/tr_image_tga.c | 0 code/{renderer => renderergl1}/tr_init.c | 0 code/{renderer => renderergl1}/tr_light.c | 0 code/{renderer => renderergl1}/tr_local.h | 4 +- code/{renderer => renderergl1}/tr_main.c | 0 code/{renderer => renderergl1}/tr_marks.c | 0 code/{renderer => renderergl1}/tr_mesh.c | 0 code/{renderer => renderergl1}/tr_model.c | 0 code/{renderer => renderergl1}/tr_model_iqm.c | 0 code/{renderer => renderergl1}/tr_noise.c | 0 code/{renderer => renderergl1}/tr_scene.c | 0 code/{renderer => renderergl1}/tr_shade.c | 0 .../{renderer => renderergl1}/tr_shade_calc.c | 0 code/{renderer => renderergl1}/tr_shader.c | 0 code/{rend2 => renderergl1}/tr_shadows.c | 0 code/{renderer => renderergl1}/tr_sky.c | 0 code/{rend2 => renderergl1}/tr_subs.c | 0 code/{renderer => renderergl1}/tr_surface.c | 0 code/{renderer => renderergl1}/tr_world.c | 0 .../{rend2 => renderergl2}/glsl/bokeh_fp.glsl | 0 .../{rend2 => renderergl2}/glsl/bokeh_vp.glsl | 0 .../glsl/calclevels4x_fp.glsl | 0 .../glsl/calclevels4x_vp.glsl | 0 .../glsl/depthblur_fp.glsl | 0 .../glsl/depthblur_vp.glsl | 0 .../glsl/dlight_fp.glsl | 0 .../glsl/dlight_vp.glsl | 0 .../glsl/down4x_fp.glsl | 0 .../glsl/down4x_vp.glsl | 0 .../glsl/fogpass_fp.glsl | 0 .../glsl/fogpass_vp.glsl | 0 .../glsl/generic_fp.glsl | 0 .../glsl/generic_vp.glsl | 0 .../glsl/lightall_fp.glsl | 0 .../glsl/lightall_vp.glsl | 0 .../glsl/pshadow_fp.glsl | 0 .../glsl/pshadow_vp.glsl | 0 .../glsl/shadowfill_fp.glsl | 0 .../glsl/shadowfill_vp.glsl | 0 .../glsl/shadowmask_fp.glsl | 0 .../glsl/shadowmask_vp.glsl | 0 code/{rend2 => renderergl2}/glsl/ssao_fp.glsl | 0 code/{rend2 => renderergl2}/glsl/ssao_vp.glsl | 0 .../glsl/texturecolor_fp.glsl | 0 .../glsl/texturecolor_vp.glsl | 0 .../glsl/tonemap_fp.glsl | 0 .../glsl/tonemap_vp.glsl | 0 code/{rend2 => renderergl2}/qgl.h | 0 code/{rend2 => renderergl2}/tr_animation.c | 0 code/{rend2 => renderergl2}/tr_backend.c | 0 code/{rend2 => renderergl2}/tr_bsp.c | 0 code/{rend2 => renderergl2}/tr_cmds.c | 0 code/{rend2 => renderergl2}/tr_curve.c | 0 code/{rend2 => renderergl2}/tr_extensions.c | 0 code/{rend2 => renderergl2}/tr_extramath.c | 0 code/{rend2 => renderergl2}/tr_extramath.h | 0 code/{rend2 => renderergl2}/tr_extratypes.h | 0 code/{rend2 => renderergl2}/tr_fbo.c | 0 code/{rend2 => renderergl2}/tr_fbo.h | 0 code/{rend2 => renderergl2}/tr_flares.c | 0 code/{rend2 => renderergl2}/tr_font.c | 0 code/{rend2 => renderergl2}/tr_glsl.c | 0 code/{rend2 => renderergl2}/tr_image.c | 0 code/{rend2 => renderergl2}/tr_image_bmp.c | 2 +- code/{rend2 => renderergl2}/tr_image_jpg.c | 2 +- code/{rend2 => renderergl2}/tr_image_pcx.c | 2 +- code/{rend2 => renderergl2}/tr_image_png.c | 2 +- code/{rend2 => renderergl2}/tr_image_tga.c | 2 +- code/{rend2 => renderergl2}/tr_init.c | 0 code/{rend2 => renderergl2}/tr_light.c | 0 code/{rend2 => renderergl2}/tr_local.h | 4 +- code/{rend2 => renderergl2}/tr_main.c | 0 code/{rend2 => renderergl2}/tr_marks.c | 0 code/{rend2 => renderergl2}/tr_mesh.c | 0 code/{rend2 => renderergl2}/tr_model.c | 0 code/{rend2 => renderergl2}/tr_model_iqm.c | 0 code/{rend2 => renderergl2}/tr_noise.c | 0 code/{rend2 => renderergl2}/tr_postprocess.c | 0 code/{rend2 => renderergl2}/tr_postprocess.h | 0 code/{rend2 => renderergl2}/tr_scene.c | 0 code/{rend2 => renderergl2}/tr_shade.c | 0 code/{rend2 => renderergl2}/tr_shade_calc.c | 0 code/{rend2 => renderergl2}/tr_shader.c | 0 code/{renderer => renderergl2}/tr_shadows.c | 0 code/{rend2 => renderergl2}/tr_sky.c | 0 code/{renderer => renderergl2}/tr_subs.c | 0 code/{rend2 => renderergl2}/tr_surface.c | 0 code/{rend2 => renderergl2}/tr_vbo.c | 0 code/{rend2 => renderergl2}/tr_world.c | 0 code/sdl/sdl_gamma.c | 2 +- code/sdl/sdl_glimp.c | 3 +- code/ui/ui_local.h | 2 +- code/ui/ui_shared.h | 2 +- misc/msvc/ioq3.sln | 2 +- misc/msvc/opengl2.vcproj | 1077 +++++++++++++++++ misc/msvc/rend2.vcproj | 1076 ---------------- misc/nsis/ioquake3.nsi.in | 4 +- misc/setup/doit | 2 +- rend2-readme.txt => opengl2-readme.txt | 31 +- 120 files changed, 1277 insertions(+), 1294 deletions(-) rename code/{renderer => renderercommon}/iqm.h (100%) rename code/{renderer => renderercommon}/tr_public.h (100%) rename code/{renderer => renderercommon}/tr_types.h (100%) rename code/{renderer => renderergl1}/qgl.h (100%) rename code/{renderer => renderergl1}/tr_animation.c (100%) rename code/{renderer => renderergl1}/tr_backend.c (100%) rename code/{renderer => renderergl1}/tr_bsp.c (100%) rename code/{renderer => renderergl1}/tr_cmds.c (100%) rename code/{renderer => renderergl1}/tr_curve.c (100%) rename code/{renderer => renderergl1}/tr_flares.c (100%) rename code/{renderer => renderergl1}/tr_font.c (100%) rename code/{renderer => renderergl1}/tr_image.c (100%) rename code/{renderer => renderergl1}/tr_image_bmp.c (100%) rename code/{renderer => renderergl1}/tr_image_jpg.c (100%) rename code/{renderer => renderergl1}/tr_image_pcx.c (100%) rename code/{renderer => renderergl1}/tr_image_png.c (100%) rename code/{renderer => renderergl1}/tr_image_tga.c (100%) rename code/{renderer => renderergl1}/tr_init.c (100%) rename code/{renderer => renderergl1}/tr_light.c (100%) rename code/{renderer => renderergl1}/tr_local.h (99%) rename code/{renderer => renderergl1}/tr_main.c (100%) rename code/{renderer => renderergl1}/tr_marks.c (100%) rename code/{renderer => renderergl1}/tr_mesh.c (100%) rename code/{renderer => renderergl1}/tr_model.c (100%) rename code/{renderer => renderergl1}/tr_model_iqm.c (100%) rename code/{renderer => renderergl1}/tr_noise.c (100%) rename code/{renderer => renderergl1}/tr_scene.c (100%) rename code/{renderer => renderergl1}/tr_shade.c (100%) rename code/{renderer => renderergl1}/tr_shade_calc.c (100%) rename code/{renderer => renderergl1}/tr_shader.c (100%) rename code/{rend2 => renderergl1}/tr_shadows.c (100%) rename code/{renderer => renderergl1}/tr_sky.c (100%) rename code/{rend2 => renderergl1}/tr_subs.c (100%) rename code/{renderer => renderergl1}/tr_surface.c (100%) rename code/{renderer => renderergl1}/tr_world.c (100%) rename code/{rend2 => renderergl2}/glsl/bokeh_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/bokeh_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/calclevels4x_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/calclevels4x_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/depthblur_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/depthblur_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/dlight_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/dlight_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/down4x_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/down4x_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/fogpass_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/fogpass_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/generic_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/generic_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/lightall_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/lightall_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/pshadow_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/pshadow_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/shadowfill_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/shadowfill_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/shadowmask_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/shadowmask_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/ssao_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/ssao_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/texturecolor_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/texturecolor_vp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/tonemap_fp.glsl (100%) rename code/{rend2 => renderergl2}/glsl/tonemap_vp.glsl (100%) rename code/{rend2 => renderergl2}/qgl.h (100%) rename code/{rend2 => renderergl2}/tr_animation.c (100%) rename code/{rend2 => renderergl2}/tr_backend.c (100%) rename code/{rend2 => renderergl2}/tr_bsp.c (100%) rename code/{rend2 => renderergl2}/tr_cmds.c (100%) rename code/{rend2 => renderergl2}/tr_curve.c (100%) rename code/{rend2 => renderergl2}/tr_extensions.c (100%) rename code/{rend2 => renderergl2}/tr_extramath.c (100%) rename code/{rend2 => renderergl2}/tr_extramath.h (100%) rename code/{rend2 => renderergl2}/tr_extratypes.h (100%) rename code/{rend2 => renderergl2}/tr_fbo.c (100%) rename code/{rend2 => renderergl2}/tr_fbo.h (100%) rename code/{rend2 => renderergl2}/tr_flares.c (100%) rename code/{rend2 => renderergl2}/tr_font.c (100%) rename code/{rend2 => renderergl2}/tr_glsl.c (100%) rename code/{rend2 => renderergl2}/tr_image.c (100%) rename code/{rend2 => renderergl2}/tr_image_bmp.c (99%) rename code/{rend2 => renderergl2}/tr_image_jpg.c (99%) rename code/{rend2 => renderergl2}/tr_image_pcx.c (98%) rename code/{rend2 => renderergl2}/tr_image_png.c (99%) rename code/{rend2 => renderergl2}/tr_image_tga.c (99%) rename code/{rend2 => renderergl2}/tr_init.c (100%) rename code/{rend2 => renderergl2}/tr_light.c (100%) rename code/{rend2 => renderergl2}/tr_local.h (99%) rename code/{rend2 => renderergl2}/tr_main.c (100%) rename code/{rend2 => renderergl2}/tr_marks.c (100%) rename code/{rend2 => renderergl2}/tr_mesh.c (100%) rename code/{rend2 => renderergl2}/tr_model.c (100%) rename code/{rend2 => renderergl2}/tr_model_iqm.c (100%) rename code/{rend2 => renderergl2}/tr_noise.c (100%) rename code/{rend2 => renderergl2}/tr_postprocess.c (100%) rename code/{rend2 => renderergl2}/tr_postprocess.h (100%) rename code/{rend2 => renderergl2}/tr_scene.c (100%) rename code/{rend2 => renderergl2}/tr_shade.c (100%) rename code/{rend2 => renderergl2}/tr_shade_calc.c (100%) rename code/{rend2 => renderergl2}/tr_shader.c (100%) rename code/{renderer => renderergl2}/tr_shadows.c (100%) rename code/{rend2 => renderergl2}/tr_sky.c (100%) rename code/{renderer => renderergl2}/tr_subs.c (100%) rename code/{rend2 => renderergl2}/tr_surface.c (100%) rename code/{rend2 => renderergl2}/tr_vbo.c (100%) rename code/{rend2 => renderergl2}/tr_world.c (100%) create mode 100644 misc/msvc/opengl2.vcproj delete mode 100644 misc/msvc/rend2.vcproj rename rend2-readme.txt => opengl2-readme.txt (95%) diff --git a/Makefile b/Makefile index e062ca9a..b245f911 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,8 @@ endif ifndef BUILD_MISSIONPACK BUILD_MISSIONPACK= endif -ifndef BUILD_RENDERER_REND2 - BUILD_RENDERER_REND2= +ifndef BUILD_RENDERER_OPENGL2 + BUILD_RENDERER_OPENGL2= endif ############################################################################# @@ -211,8 +211,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 @@ -852,13 +852,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 @@ -1165,9 +1165,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 @@ -1473,171 +1473,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),i386) @@ -1807,7 +1807,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) @@ -1818,7 +1818,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) \ @@ -2346,25 +2346,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) @@ -2513,8 +2513,8 @@ ifneq ($(BUILD_CLIENT),0) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/$(CLIENTBIN)$(FULLBINEXT) $(COPYBINDIR)/$(CLIENTBIN)$(FULLBINEXT) ifneq ($(USE_RENDERER_DLOPEN),0) $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl1_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl1_$(SHLIBNAME) - ifneq ($(BUILD_RENDERER_REND2),0) - $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_rend2_$(SHLIBNAME) $(COPYBINDIR)/renderer_rend2_$(SHLIBNAME) + ifneq ($(BUILD_RENDERER_OPENGL2),0) + $(INSTALL) $(STRIP_FLAG) -m 0755 $(BR)/renderer_opengl2_$(SHLIBNAME) $(COPYBINDIR)/renderer_opengl2_$(SHLIBNAME) endif endif endif diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index 923c22ca..4c4f6eaa 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // #include "../qcommon/q_shared.h" -#include "../renderer/tr_types.h" +#include "../renderercommon/tr_types.h" #include "../game/bg_public.h" #include "cg_public.h" diff --git a/code/client/client.h b/code/client/client.h index 3d620030..a6155555 100644 --- a/code/client/client.h +++ b/code/client/client.h @@ -23,7 +23,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/code/null/null_glimp.c b/code/null/null_glimp.c index c9a9d730..042e4281 100644 --- a/code/null/null_glimp.c +++ b/code/null/null_glimp.c @@ -19,7 +19,7 @@ along with Quake III Arena source code; 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/code/q3_ui/ui_local.h b/code/q3_ui/ui_local.h index 166a324a..72979a9e 100644 --- a/code/q3_ui/ui_local.h +++ b/code/q3_ui/ui_local.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define __UI_LOCAL_H__ #include "../qcommon/q_shared.h" -#include "../renderer/tr_types.h" +#include "../renderercommon/tr_types.h" //NOTE: include the ui_public.h from the new UI #include "../ui/ui_public.h" //redefine to old API version diff --git a/code/renderer/iqm.h b/code/renderercommon/iqm.h similarity index 100% rename from code/renderer/iqm.h rename to code/renderercommon/iqm.h diff --git a/code/renderer/tr_public.h b/code/renderercommon/tr_public.h similarity index 100% rename from code/renderer/tr_public.h rename to code/renderercommon/tr_public.h diff --git a/code/renderer/tr_types.h b/code/renderercommon/tr_types.h similarity index 100% rename from code/renderer/tr_types.h rename to code/renderercommon/tr_types.h diff --git a/code/renderer/qgl.h b/code/renderergl1/qgl.h similarity index 100% rename from code/renderer/qgl.h rename to code/renderergl1/qgl.h diff --git a/code/renderer/tr_animation.c b/code/renderergl1/tr_animation.c similarity index 100% rename from code/renderer/tr_animation.c rename to code/renderergl1/tr_animation.c diff --git a/code/renderer/tr_backend.c b/code/renderergl1/tr_backend.c similarity index 100% rename from code/renderer/tr_backend.c rename to code/renderergl1/tr_backend.c diff --git a/code/renderer/tr_bsp.c b/code/renderergl1/tr_bsp.c similarity index 100% rename from code/renderer/tr_bsp.c rename to code/renderergl1/tr_bsp.c diff --git a/code/renderer/tr_cmds.c b/code/renderergl1/tr_cmds.c similarity index 100% rename from code/renderer/tr_cmds.c rename to code/renderergl1/tr_cmds.c diff --git a/code/renderer/tr_curve.c b/code/renderergl1/tr_curve.c similarity index 100% rename from code/renderer/tr_curve.c rename to code/renderergl1/tr_curve.c diff --git a/code/renderer/tr_flares.c b/code/renderergl1/tr_flares.c similarity index 100% rename from code/renderer/tr_flares.c rename to code/renderergl1/tr_flares.c diff --git a/code/renderer/tr_font.c b/code/renderergl1/tr_font.c similarity index 100% rename from code/renderer/tr_font.c rename to code/renderergl1/tr_font.c diff --git a/code/renderer/tr_image.c b/code/renderergl1/tr_image.c similarity index 100% rename from code/renderer/tr_image.c rename to code/renderergl1/tr_image.c diff --git a/code/renderer/tr_image_bmp.c b/code/renderergl1/tr_image_bmp.c similarity index 100% rename from code/renderer/tr_image_bmp.c rename to code/renderergl1/tr_image_bmp.c diff --git a/code/renderer/tr_image_jpg.c b/code/renderergl1/tr_image_jpg.c similarity index 100% rename from code/renderer/tr_image_jpg.c rename to code/renderergl1/tr_image_jpg.c diff --git a/code/renderer/tr_image_pcx.c b/code/renderergl1/tr_image_pcx.c similarity index 100% rename from code/renderer/tr_image_pcx.c rename to code/renderergl1/tr_image_pcx.c diff --git a/code/renderer/tr_image_png.c b/code/renderergl1/tr_image_png.c similarity index 100% rename from code/renderer/tr_image_png.c rename to code/renderergl1/tr_image_png.c diff --git a/code/renderer/tr_image_tga.c b/code/renderergl1/tr_image_tga.c similarity index 100% rename from code/renderer/tr_image_tga.c rename to code/renderergl1/tr_image_tga.c diff --git a/code/renderer/tr_init.c b/code/renderergl1/tr_init.c similarity index 100% rename from code/renderer/tr_init.c rename to code/renderergl1/tr_init.c diff --git a/code/renderer/tr_light.c b/code/renderergl1/tr_light.c similarity index 100% rename from code/renderer/tr_light.c rename to code/renderergl1/tr_light.c diff --git a/code/renderer/tr_local.h b/code/renderergl1/tr_local.h similarity index 99% rename from code/renderer/tr_local.h rename to code/renderergl1/tr_local.h index ce14c4a4..ffb2987b 100644 --- a/code/renderer/tr_local.h +++ b/code/renderergl1/tr_local.h @@ -27,9 +27,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/code/renderer/tr_main.c b/code/renderergl1/tr_main.c similarity index 100% rename from code/renderer/tr_main.c rename to code/renderergl1/tr_main.c diff --git a/code/renderer/tr_marks.c b/code/renderergl1/tr_marks.c similarity index 100% rename from code/renderer/tr_marks.c rename to code/renderergl1/tr_marks.c diff --git a/code/renderer/tr_mesh.c b/code/renderergl1/tr_mesh.c similarity index 100% rename from code/renderer/tr_mesh.c rename to code/renderergl1/tr_mesh.c diff --git a/code/renderer/tr_model.c b/code/renderergl1/tr_model.c similarity index 100% rename from code/renderer/tr_model.c rename to code/renderergl1/tr_model.c diff --git a/code/renderer/tr_model_iqm.c b/code/renderergl1/tr_model_iqm.c similarity index 100% rename from code/renderer/tr_model_iqm.c rename to code/renderergl1/tr_model_iqm.c diff --git a/code/renderer/tr_noise.c b/code/renderergl1/tr_noise.c similarity index 100% rename from code/renderer/tr_noise.c rename to code/renderergl1/tr_noise.c diff --git a/code/renderer/tr_scene.c b/code/renderergl1/tr_scene.c similarity index 100% rename from code/renderer/tr_scene.c rename to code/renderergl1/tr_scene.c diff --git a/code/renderer/tr_shade.c b/code/renderergl1/tr_shade.c similarity index 100% rename from code/renderer/tr_shade.c rename to code/renderergl1/tr_shade.c diff --git a/code/renderer/tr_shade_calc.c b/code/renderergl1/tr_shade_calc.c similarity index 100% rename from code/renderer/tr_shade_calc.c rename to code/renderergl1/tr_shade_calc.c diff --git a/code/renderer/tr_shader.c b/code/renderergl1/tr_shader.c similarity index 100% rename from code/renderer/tr_shader.c rename to code/renderergl1/tr_shader.c diff --git a/code/rend2/tr_shadows.c b/code/renderergl1/tr_shadows.c similarity index 100% rename from code/rend2/tr_shadows.c rename to code/renderergl1/tr_shadows.c diff --git a/code/renderer/tr_sky.c b/code/renderergl1/tr_sky.c similarity index 100% rename from code/renderer/tr_sky.c rename to code/renderergl1/tr_sky.c diff --git a/code/rend2/tr_subs.c b/code/renderergl1/tr_subs.c similarity index 100% rename from code/rend2/tr_subs.c rename to code/renderergl1/tr_subs.c diff --git a/code/renderer/tr_surface.c b/code/renderergl1/tr_surface.c similarity index 100% rename from code/renderer/tr_surface.c rename to code/renderergl1/tr_surface.c diff --git a/code/renderer/tr_world.c b/code/renderergl1/tr_world.c similarity index 100% rename from code/renderer/tr_world.c rename to code/renderergl1/tr_world.c diff --git a/code/rend2/glsl/bokeh_fp.glsl b/code/renderergl2/glsl/bokeh_fp.glsl similarity index 100% rename from code/rend2/glsl/bokeh_fp.glsl rename to code/renderergl2/glsl/bokeh_fp.glsl diff --git a/code/rend2/glsl/bokeh_vp.glsl b/code/renderergl2/glsl/bokeh_vp.glsl similarity index 100% rename from code/rend2/glsl/bokeh_vp.glsl rename to code/renderergl2/glsl/bokeh_vp.glsl diff --git a/code/rend2/glsl/calclevels4x_fp.glsl b/code/renderergl2/glsl/calclevels4x_fp.glsl similarity index 100% rename from code/rend2/glsl/calclevels4x_fp.glsl rename to code/renderergl2/glsl/calclevels4x_fp.glsl diff --git a/code/rend2/glsl/calclevels4x_vp.glsl b/code/renderergl2/glsl/calclevels4x_vp.glsl similarity index 100% rename from code/rend2/glsl/calclevels4x_vp.glsl rename to code/renderergl2/glsl/calclevels4x_vp.glsl diff --git a/code/rend2/glsl/depthblur_fp.glsl b/code/renderergl2/glsl/depthblur_fp.glsl similarity index 100% rename from code/rend2/glsl/depthblur_fp.glsl rename to code/renderergl2/glsl/depthblur_fp.glsl diff --git a/code/rend2/glsl/depthblur_vp.glsl b/code/renderergl2/glsl/depthblur_vp.glsl similarity index 100% rename from code/rend2/glsl/depthblur_vp.glsl rename to code/renderergl2/glsl/depthblur_vp.glsl diff --git a/code/rend2/glsl/dlight_fp.glsl b/code/renderergl2/glsl/dlight_fp.glsl similarity index 100% rename from code/rend2/glsl/dlight_fp.glsl rename to code/renderergl2/glsl/dlight_fp.glsl diff --git a/code/rend2/glsl/dlight_vp.glsl b/code/renderergl2/glsl/dlight_vp.glsl similarity index 100% rename from code/rend2/glsl/dlight_vp.glsl rename to code/renderergl2/glsl/dlight_vp.glsl diff --git a/code/rend2/glsl/down4x_fp.glsl b/code/renderergl2/glsl/down4x_fp.glsl similarity index 100% rename from code/rend2/glsl/down4x_fp.glsl rename to code/renderergl2/glsl/down4x_fp.glsl diff --git a/code/rend2/glsl/down4x_vp.glsl b/code/renderergl2/glsl/down4x_vp.glsl similarity index 100% rename from code/rend2/glsl/down4x_vp.glsl rename to code/renderergl2/glsl/down4x_vp.glsl diff --git a/code/rend2/glsl/fogpass_fp.glsl b/code/renderergl2/glsl/fogpass_fp.glsl similarity index 100% rename from code/rend2/glsl/fogpass_fp.glsl rename to code/renderergl2/glsl/fogpass_fp.glsl diff --git a/code/rend2/glsl/fogpass_vp.glsl b/code/renderergl2/glsl/fogpass_vp.glsl similarity index 100% rename from code/rend2/glsl/fogpass_vp.glsl rename to code/renderergl2/glsl/fogpass_vp.glsl diff --git a/code/rend2/glsl/generic_fp.glsl b/code/renderergl2/glsl/generic_fp.glsl similarity index 100% rename from code/rend2/glsl/generic_fp.glsl rename to code/renderergl2/glsl/generic_fp.glsl diff --git a/code/rend2/glsl/generic_vp.glsl b/code/renderergl2/glsl/generic_vp.glsl similarity index 100% rename from code/rend2/glsl/generic_vp.glsl rename to code/renderergl2/glsl/generic_vp.glsl diff --git a/code/rend2/glsl/lightall_fp.glsl b/code/renderergl2/glsl/lightall_fp.glsl similarity index 100% rename from code/rend2/glsl/lightall_fp.glsl rename to code/renderergl2/glsl/lightall_fp.glsl diff --git a/code/rend2/glsl/lightall_vp.glsl b/code/renderergl2/glsl/lightall_vp.glsl similarity index 100% rename from code/rend2/glsl/lightall_vp.glsl rename to code/renderergl2/glsl/lightall_vp.glsl diff --git a/code/rend2/glsl/pshadow_fp.glsl b/code/renderergl2/glsl/pshadow_fp.glsl similarity index 100% rename from code/rend2/glsl/pshadow_fp.glsl rename to code/renderergl2/glsl/pshadow_fp.glsl diff --git a/code/rend2/glsl/pshadow_vp.glsl b/code/renderergl2/glsl/pshadow_vp.glsl similarity index 100% rename from code/rend2/glsl/pshadow_vp.glsl rename to code/renderergl2/glsl/pshadow_vp.glsl diff --git a/code/rend2/glsl/shadowfill_fp.glsl b/code/renderergl2/glsl/shadowfill_fp.glsl similarity index 100% rename from code/rend2/glsl/shadowfill_fp.glsl rename to code/renderergl2/glsl/shadowfill_fp.glsl diff --git a/code/rend2/glsl/shadowfill_vp.glsl b/code/renderergl2/glsl/shadowfill_vp.glsl similarity index 100% rename from code/rend2/glsl/shadowfill_vp.glsl rename to code/renderergl2/glsl/shadowfill_vp.glsl diff --git a/code/rend2/glsl/shadowmask_fp.glsl b/code/renderergl2/glsl/shadowmask_fp.glsl similarity index 100% rename from code/rend2/glsl/shadowmask_fp.glsl rename to code/renderergl2/glsl/shadowmask_fp.glsl diff --git a/code/rend2/glsl/shadowmask_vp.glsl b/code/renderergl2/glsl/shadowmask_vp.glsl similarity index 100% rename from code/rend2/glsl/shadowmask_vp.glsl rename to code/renderergl2/glsl/shadowmask_vp.glsl diff --git a/code/rend2/glsl/ssao_fp.glsl b/code/renderergl2/glsl/ssao_fp.glsl similarity index 100% rename from code/rend2/glsl/ssao_fp.glsl rename to code/renderergl2/glsl/ssao_fp.glsl diff --git a/code/rend2/glsl/ssao_vp.glsl b/code/renderergl2/glsl/ssao_vp.glsl similarity index 100% rename from code/rend2/glsl/ssao_vp.glsl rename to code/renderergl2/glsl/ssao_vp.glsl diff --git a/code/rend2/glsl/texturecolor_fp.glsl b/code/renderergl2/glsl/texturecolor_fp.glsl similarity index 100% rename from code/rend2/glsl/texturecolor_fp.glsl rename to code/renderergl2/glsl/texturecolor_fp.glsl diff --git a/code/rend2/glsl/texturecolor_vp.glsl b/code/renderergl2/glsl/texturecolor_vp.glsl similarity index 100% rename from code/rend2/glsl/texturecolor_vp.glsl rename to code/renderergl2/glsl/texturecolor_vp.glsl diff --git a/code/rend2/glsl/tonemap_fp.glsl b/code/renderergl2/glsl/tonemap_fp.glsl similarity index 100% rename from code/rend2/glsl/tonemap_fp.glsl rename to code/renderergl2/glsl/tonemap_fp.glsl diff --git a/code/rend2/glsl/tonemap_vp.glsl b/code/renderergl2/glsl/tonemap_vp.glsl similarity index 100% rename from code/rend2/glsl/tonemap_vp.glsl rename to code/renderergl2/glsl/tonemap_vp.glsl diff --git a/code/rend2/qgl.h b/code/renderergl2/qgl.h similarity index 100% rename from code/rend2/qgl.h rename to code/renderergl2/qgl.h diff --git a/code/rend2/tr_animation.c b/code/renderergl2/tr_animation.c similarity index 100% rename from code/rend2/tr_animation.c rename to code/renderergl2/tr_animation.c diff --git a/code/rend2/tr_backend.c b/code/renderergl2/tr_backend.c similarity index 100% rename from code/rend2/tr_backend.c rename to code/renderergl2/tr_backend.c diff --git a/code/rend2/tr_bsp.c b/code/renderergl2/tr_bsp.c similarity index 100% rename from code/rend2/tr_bsp.c rename to code/renderergl2/tr_bsp.c diff --git a/code/rend2/tr_cmds.c b/code/renderergl2/tr_cmds.c similarity index 100% rename from code/rend2/tr_cmds.c rename to code/renderergl2/tr_cmds.c diff --git a/code/rend2/tr_curve.c b/code/renderergl2/tr_curve.c similarity index 100% rename from code/rend2/tr_curve.c rename to code/renderergl2/tr_curve.c diff --git a/code/rend2/tr_extensions.c b/code/renderergl2/tr_extensions.c similarity index 100% rename from code/rend2/tr_extensions.c rename to code/renderergl2/tr_extensions.c diff --git a/code/rend2/tr_extramath.c b/code/renderergl2/tr_extramath.c similarity index 100% rename from code/rend2/tr_extramath.c rename to code/renderergl2/tr_extramath.c diff --git a/code/rend2/tr_extramath.h b/code/renderergl2/tr_extramath.h similarity index 100% rename from code/rend2/tr_extramath.h rename to code/renderergl2/tr_extramath.h diff --git a/code/rend2/tr_extratypes.h b/code/renderergl2/tr_extratypes.h similarity index 100% rename from code/rend2/tr_extratypes.h rename to code/renderergl2/tr_extratypes.h diff --git a/code/rend2/tr_fbo.c b/code/renderergl2/tr_fbo.c similarity index 100% rename from code/rend2/tr_fbo.c rename to code/renderergl2/tr_fbo.c diff --git a/code/rend2/tr_fbo.h b/code/renderergl2/tr_fbo.h similarity index 100% rename from code/rend2/tr_fbo.h rename to code/renderergl2/tr_fbo.h diff --git a/code/rend2/tr_flares.c b/code/renderergl2/tr_flares.c similarity index 100% rename from code/rend2/tr_flares.c rename to code/renderergl2/tr_flares.c diff --git a/code/rend2/tr_font.c b/code/renderergl2/tr_font.c similarity index 100% rename from code/rend2/tr_font.c rename to code/renderergl2/tr_font.c diff --git a/code/rend2/tr_glsl.c b/code/renderergl2/tr_glsl.c similarity index 100% rename from code/rend2/tr_glsl.c rename to code/renderergl2/tr_glsl.c diff --git a/code/rend2/tr_image.c b/code/renderergl2/tr_image.c similarity index 100% rename from code/rend2/tr_image.c rename to code/renderergl2/tr_image.c diff --git a/code/rend2/tr_image_bmp.c b/code/renderergl2/tr_image_bmp.c similarity index 99% rename from code/rend2/tr_image_bmp.c rename to code/renderergl2/tr_image_bmp.c index 707bee3b..87ea9e4a 100644 --- a/code/rend2/tr_image_bmp.c +++ b/code/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/code/rend2/tr_image_jpg.c b/code/renderergl2/tr_image_jpg.c similarity index 99% rename from code/rend2/tr_image_jpg.c rename to code/renderergl2/tr_image_jpg.c index 494b4a28..fb769263 100644 --- a/code/rend2/tr_image_jpg.c +++ b/code/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/code/rend2/tr_image_pcx.c b/code/renderergl2/tr_image_pcx.c similarity index 98% rename from code/rend2/tr_image_pcx.c rename to code/renderergl2/tr_image_pcx.c index d4dd575d..5e1de51b 100644 --- a/code/rend2/tr_image_pcx.c +++ b/code/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/code/rend2/tr_image_png.c b/code/renderergl2/tr_image_png.c similarity index 99% rename from code/rend2/tr_image_png.c rename to code/renderergl2/tr_image_png.c index ee37aa75..a0729c39 100644 --- a/code/rend2/tr_image_png.c +++ b/code/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/code/rend2/tr_image_tga.c b/code/renderergl2/tr_image_tga.c similarity index 99% rename from code/rend2/tr_image_tga.c rename to code/renderergl2/tr_image_tga.c index 27ca0d7b..363c0b3f 100644 --- a/code/rend2/tr_image_tga.c +++ b/code/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/code/rend2/tr_init.c b/code/renderergl2/tr_init.c similarity index 100% rename from code/rend2/tr_init.c rename to code/renderergl2/tr_init.c diff --git a/code/rend2/tr_light.c b/code/renderergl2/tr_light.c similarity index 100% rename from code/rend2/tr_light.c rename to code/renderergl2/tr_light.c diff --git a/code/rend2/tr_local.h b/code/renderergl2/tr_local.h similarity index 99% rename from code/rend2/tr_local.h rename to code/renderergl2/tr_local.h index ec3d5214..f95261fb 100644 --- a/code/rend2/tr_local.h +++ b/code/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/code/rend2/tr_main.c b/code/renderergl2/tr_main.c similarity index 100% rename from code/rend2/tr_main.c rename to code/renderergl2/tr_main.c diff --git a/code/rend2/tr_marks.c b/code/renderergl2/tr_marks.c similarity index 100% rename from code/rend2/tr_marks.c rename to code/renderergl2/tr_marks.c diff --git a/code/rend2/tr_mesh.c b/code/renderergl2/tr_mesh.c similarity index 100% rename from code/rend2/tr_mesh.c rename to code/renderergl2/tr_mesh.c diff --git a/code/rend2/tr_model.c b/code/renderergl2/tr_model.c similarity index 100% rename from code/rend2/tr_model.c rename to code/renderergl2/tr_model.c diff --git a/code/rend2/tr_model_iqm.c b/code/renderergl2/tr_model_iqm.c similarity index 100% rename from code/rend2/tr_model_iqm.c rename to code/renderergl2/tr_model_iqm.c diff --git a/code/rend2/tr_noise.c b/code/renderergl2/tr_noise.c similarity index 100% rename from code/rend2/tr_noise.c rename to code/renderergl2/tr_noise.c diff --git a/code/rend2/tr_postprocess.c b/code/renderergl2/tr_postprocess.c similarity index 100% rename from code/rend2/tr_postprocess.c rename to code/renderergl2/tr_postprocess.c diff --git a/code/rend2/tr_postprocess.h b/code/renderergl2/tr_postprocess.h similarity index 100% rename from code/rend2/tr_postprocess.h rename to code/renderergl2/tr_postprocess.h diff --git a/code/rend2/tr_scene.c b/code/renderergl2/tr_scene.c similarity index 100% rename from code/rend2/tr_scene.c rename to code/renderergl2/tr_scene.c diff --git a/code/rend2/tr_shade.c b/code/renderergl2/tr_shade.c similarity index 100% rename from code/rend2/tr_shade.c rename to code/renderergl2/tr_shade.c diff --git a/code/rend2/tr_shade_calc.c b/code/renderergl2/tr_shade_calc.c similarity index 100% rename from code/rend2/tr_shade_calc.c rename to code/renderergl2/tr_shade_calc.c diff --git a/code/rend2/tr_shader.c b/code/renderergl2/tr_shader.c similarity index 100% rename from code/rend2/tr_shader.c rename to code/renderergl2/tr_shader.c diff --git a/code/renderer/tr_shadows.c b/code/renderergl2/tr_shadows.c similarity index 100% rename from code/renderer/tr_shadows.c rename to code/renderergl2/tr_shadows.c diff --git a/code/rend2/tr_sky.c b/code/renderergl2/tr_sky.c similarity index 100% rename from code/rend2/tr_sky.c rename to code/renderergl2/tr_sky.c diff --git a/code/renderer/tr_subs.c b/code/renderergl2/tr_subs.c similarity index 100% rename from code/renderer/tr_subs.c rename to code/renderergl2/tr_subs.c diff --git a/code/rend2/tr_surface.c b/code/renderergl2/tr_surface.c similarity index 100% rename from code/rend2/tr_surface.c rename to code/renderergl2/tr_surface.c diff --git a/code/rend2/tr_vbo.c b/code/renderergl2/tr_vbo.c similarity index 100% rename from code/rend2/tr_vbo.c rename to code/renderergl2/tr_vbo.c diff --git a/code/rend2/tr_world.c b/code/renderergl2/tr_world.c similarity index 100% rename from code/rend2/tr_world.c rename to code/renderergl2/tr_world.c diff --git a/code/sdl/sdl_gamma.c b/code/sdl/sdl_gamma.c index 94aaf5ad..e2e1da58 100644 --- a/code/sdl/sdl_gamma.c +++ b/code/sdl/sdl_gamma.c @@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # include #endif -#include "../renderer/tr_local.h" +#include "../renderergl1/tr_local.h" #include "../qcommon/qcommon.h" /* diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index c5d6f8ee..b6907eb8 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -31,7 +31,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#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" diff --git a/code/ui/ui_local.h b/code/ui/ui_local.h index 002797dc..cb41362a 100644 --- a/code/ui/ui_local.h +++ b/code/ui/ui_local.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define __UI_LOCAL_H__ #include "../qcommon/q_shared.h" -#include "../renderer/tr_types.h" +#include "../renderercommon/tr_types.h" #include "ui_public.h" #include "../client/keycodes.h" #include "../game/bg_public.h" diff --git a/code/ui/ui_shared.h b/code/ui/ui_shared.h index 48ffbc62..efde614d 100644 --- a/code/ui/ui_shared.h +++ b/code/ui/ui_shared.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "../qcommon/q_shared.h" -#include "../renderer/tr_types.h" +#include "../renderercommon/tr_types.h" #include "../client/keycodes.h" #include "../../ui/menudef.h" diff --git a/misc/msvc/ioq3.sln b/misc/msvc/ioq3.sln index feeb79b9..acc818d6 100644 --- a/misc/msvc/ioq3.sln +++ b/misc/msvc/ioq3.sln @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rend2", "rend2.vcproj", "{F7B397A4-8111-421B-A23B-B9A2CE509183}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl2", "opengl2.vcproj", "{F7B397A4-8111-421B-A23B-B9A2CE509183}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opengl1", "opengl1.vcproj", "{CD289B03-887C-4602-BDCE-AB6785A7489E}" EndProject diff --git a/misc/msvc/opengl2.vcproj b/misc/msvc/opengl2.vcproj new file mode 100644 index 00000000..cbb1f8d2 --- /dev/null +++ b/misc/msvc/opengl2.vcproj @@ -0,0 +1,1077 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/msvc/rend2.vcproj b/misc/msvc/rend2.vcproj deleted file mode 100644 index 66f714ac..00000000 --- a/misc/msvc/rend2.vcproj +++ /dev/null @@ -1,1076 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/misc/nsis/ioquake3.nsi.in b/misc/nsis/ioquake3.nsi.in index c14f7522..c30391b8 100644 --- a/misc/nsis/ioquake3.nsi.in +++ b/misc/nsis/ioquake3.nsi.in @@ -93,7 +93,7 @@ Section "ioquake3 (required)" File "../../build/release-mingw32-x86/ioquake3.x86.exe" !ifdef USE_RENDERER_DLOPEN File "../../build/release-mingw32-x86/renderer_opengl1_x86.dll" - File "../../build/release-mingw32-x86/renderer_rend2_x86.dll" + File "../../build/release-mingw32-x86/renderer_opengl2_x86.dll" !endif File "../../COPYING.txt" @@ -181,7 +181,7 @@ Section "Uninstall" Delete $INSTDIR\ioq3ded.x86.exe !ifdef USE_RENDERER_DLOPEN Delete $INSTDIR\renderer_opengl1_x86.dll - Delete $INSTDIR\renderer_rend2_x86.dll + Delete $INSTDIR\renderer_opengl2_x86.dll !endif Delete $INSTDIR\COPYING.txt diff --git a/misc/setup/doit b/misc/setup/doit index 267a07e6..2e082ba7 100755 --- a/misc/setup/doit +++ b/misc/setup/doit @@ -73,7 +73,7 @@ for arch in "${archs[@]}"; do install -m 755 $topdir/build/release-linux-$arch/ioquake3.$arch $dst/ioquake3.$arch install -m 755 $topdir/build/release-linux-$arch/ioq3ded.$arch $dst/ioq3ded.$arch install -m 755 $topdir/build/release-linux-$arch/renderer_opengl1_$arch.so $dst/renderer_opengl1_$arch.so - install -m 755 $topdir/build/release-linux-$arch/renderer_rend2_$arch.so $dst/renderer_rend2_$arch.so + install -m 755 $topdir/build/release-linux-$arch/renderer_opengl2_$arch.so $dst/renderer_opengl2_$arch.so install -m 644 $topdir/build/release-linux-$arch/baseq3/*.so $dst/baseq3 install -m 644 $topdir/build/release-linux-$arch/missionpack/*.so $dst/missionpack for i in cgame qagame ui; do diff --git a/rend2-readme.txt b/opengl2-readme.txt similarity index 95% rename from rend2-readme.txt rename to opengl2-readme.txt index 88f39bed..2a1c5f3b 100644 --- a/rend2-readme.txt +++ b/opengl2-readme.txt @@ -1,7 +1,7 @@ -Rend2 +OpenGL2 -Rend2 is an alternate renderer for ioquake3. It aims to implement modern +OpenGL2 is an alternate renderer for ioquake3. It aims to implement modern features and technologies into the id tech 3 engine, but without sacrificing compatibility with existing Quake 3 mods. @@ -23,25 +23,6 @@ compatibility with existing Quake 3 mods. - Screen-space ambient occlusion. -------------------------------------------------------------------------------- - COMPILATION -------------------------------------------------------------------------------- - -For *nix/MinGW: - -1. Download an appropriate version of the ioq3 source code. For version 32 of - Rend2, r2328 should do, though the latest may work as well. For - details on how to do this, see http://ioquake3.org/get-it/source-codes/ . - -2. Copy the patch file (for v32, vbos-glsl-31a.diff) into the directory you put - the ioq3 source code. There should be a README in that directory. - -3. Run 'patch -p0 - - State how this imagemap will be used by Rend2: + - State how this imagemap will be used by OpenGL2: diffuseMap - Standard, same as no stage entry normalMap - Image will be used as a normal map normalParallaxMap - Image will be used as a normal map with