qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-15 01:11:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/video/renderer/glsl/glsl_main.c

227 lines
4.6 KiB
C
Raw Normal View History

Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
/*
glsl_main.c
GLSL rendering
Copyright (C) 2011 Bill Currie <bill@taniwha.org>
Author: Bill Currie <bill@taniwha.org>
Date: 2011/12/23
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Get glsl running as a null renderer. This means that nq-glslx can get through demo1, demo2, demo3 and bigass1 without crashing. However, nothing is rendered, so unless you like black, it's not very interesting.
2011-12-25 03:57:23 +00:00
#ifdef HAVE_STRING_H
# include "string.h"
#endif
#ifdef HAVE_STRINGS_H
# include "strings.h"
#endif
Hook up the pointfile loader in glsl. I was always wondering what that was for (never bothered looking at the command registration, I guess :P).
2012-09-12 00:54:24 +00:00
#include "QF/cmd.h"
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
#include "QF/cvar.h"
Build qw-client-glslx too. I was asked about timedemo overkill (bigass1 currently gets 40kfps, haha), so I had to add qw-client-glslx to the build.
2011-12-25 07:41:14 +00:00
#include "QF/image.h"
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
#include "QF/render.h"
#include "QF/screen.h"
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
#include "QF/sys.h"
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
#include "QF/scene/component.h"
[renderer] Support multiple entity queues While there's currently only the one still, this will allow the entities to be multiply queued for multi-pass rendering (eg, shadows). As the avoidance of putting an entity in the same queue more than once relies on the entity id, all entities now come from the scene (which is stored in cl_world in the client code for nq and qw), thus the extensive changes in the clients.
2022-03-04 16:48:10 +00:00
#include "QF/scene/entity.h"
[renderer] Use scene_t to set the model data This replaces *_NewMap with *_NewScene and adds SCR_NewScene to handle loading a new map (for quake) in the renderer, and will eventually be how any new scene is loaded.
2022-05-05 05:41:46 +00:00
#include "QF/scene/scene.h"
[renderer] Support multiple entity queues While there's currently only the one still, this will allow the entities to be multiply queued for multi-pass rendering (eg, shadows). As the avoidance of putting an entity in the same queue more than once relies on the entity id, all entities now come from the scene (which is stored in cl_world in the client code for nq and qw), thus the extensive changes in the clients.
2022-03-04 16:48:10 +00:00
Enable face culling and depth testing. I spent way too long trying to figure out why triangle order wasn't making any difference... :P
2012-01-03 09:08:01 +00:00
#include "QF/GLSL/defines.h"
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
#include "QF/GLSL/funcs.h"
Load the alias model shaders.
2012-01-02 02:18:34 +00:00
#include "QF/GLSL/qf_alias.h"
Make a start on bsp rendering. Still nothing being rendered: still in the process of building the display lists, but I'm making good progress. Get this into git before something goes wrong :)
2012-01-08 01:29:38 +00:00
#include "QF/GLSL/qf_bsp.h"
[renderer] Remove namehack.h Finally. I never liked it (felt bad adding it in the first place), and it has caused confusion with function and global variable names, but it did let me get the render plugins working.
2022-03-14 05:31:23 +00:00
#include "QF/GLSL/qf_draw.h"
[glsl] Implement fisheye rendering The code dealing with state is a bit of a mess, but everything is working nicely. Get around 400fps when all 6 faces need to be rendered (no surprise: it should be about 1/6 of that for normal rendering). The messy state handling code did not come as a surprise as I suspected there were various mistakes in my scene rendering "recipe", and fisheye highlighted them nicely (I'm sure getting this stuff working in Vulkan will highlight even more issues).
2022-03-25 03:22:16 +00:00
#include "QF/GLSL/qf_fisheye.h"
Begin work on rendering iqm models. No chance of working yet, but the shaders compile :)
2012-05-11 03:49:14 +00:00
#include "QF/GLSL/qf_iqm.h"
Actually build the lightmaps, and fix a silly bug in the scrap allocator. Also, add a command for dumping scrap statistics.
2012-01-07 06:34:31 +00:00
#include "QF/GLSL/qf_lightmap.h"
[renderer] Remove namehack.h Finally. I never liked it (felt bad adding it in the first place), and it has caused confusion with function and global variable names, but it did let me get the render plugins working.
2022-03-14 05:31:23 +00:00
#include "QF/GLSL/qf_main.h"
#include "QF/GLSL/qf_particles.h"
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
#include "QF/GLSL/qf_sprite.h"
Make a clean break heading for GLES compatibility. Add GLSL directory to QF and use it for all gsls based code (instead of GL). defines.h, types.h and funcs.h are derived from gl2.h from khronos. Text drawing now uses triangles instead of quads.
2011-12-26 07:08:55 +00:00
#include "QF/GLSL/qf_textures.h"
[glsl] Implement screen warp when in liquids Finally, after a decade :P Looks pretty good, too, and is (almost) properly scaled to the resolution (almost because the effect is a little squashed, but I think the sw renderer does the same).
2022-03-24 16:24:38 +00:00
#include "QF/GLSL/qf_warp.h"
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
Separate render module loading from initialization. This allows the vid module to load the render module and access render specific functions before the renderer initializes, which happens to need an initialized vid module...
2012-04-10 04:27:53 +00:00
#include "mod_internal.h"
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
#include "r_internal.h"
Separate render and presentation initialization This paves the way for clean initialization of the Vulkan renderer, and very much cleans up the older renderer initialization code as gl and sw are no longer intertwined.
2019-07-08 16:00:47 +00:00
#include "vid_gl.h"
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
mat4f_t glsl_projection;
mat4f_t glsl_view;
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
static void
R_SetupView (void)
{
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
static mat4f_t z_up = {
[glsl] Adjust view/projection matrices for consistency The actual view and projection matrices are now consistent with vulkan, with the vulkan-gl disparity moved into adjustment matrices. The goal is to allow the same camera data and code to be used in all renderers. The extra matrix multiplication shouldn't be too expensive as it occurs only when the field of view (not often, under user control) or near and far clip distances (very rarely) change.
2022-02-25 01:50:53 +00:00
{ 0, 0, 1, 0},
[renderer] Clean up entity_t to a certain extent This is the first step towards component-based entities. There's still some transform-related stuff in the struct that needs to be moved, but it's all entirely client related (rather than renderer) and will probably go into a "client" component. Also, the current components are directly included structs rather than references as I didn't want to deal with the object management at this stage. As part of the process (because transforms use simd) this also starts the process of moving QF to using simd for vectors and matrices. There's now a mess of simd and sisd code mixed together, but it works surprisingly well together.
2021-03-09 14:52:40 +00:00
{-1, 0, 0, 0},
{ 0, 1, 0, 0},
{ 0, 0, 0, 1},
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
};
[renderer] Clean up use of vup/vright/vpn This moves the common camera setup code out of the individual drivers, and completely removes vup/vright/vpn from the non-software renderers. This has highlighted the craziness around AngleVectors with it putting +X forward, -Y right and +Z up. The main issue with this is it requires a 90 degree pre-rotation about the Z axis to get the camera pointing in the right direction, and that's for the native sw renderer (vulkan needs a 90 degree pre-rotation about X, and gl and glsl need to invert an axis, too), though at least it's just a matrix swizzle and vector negation. However, it does mean the camera matrices can't be used directly. Also rename vpn to vfwd (still abbreviated, but fwd is much clearer in meaning (to me, at least) than pn (plane normal, I guess, but which way?)).
2022-03-14 00:34:24 +00:00
mmulf (glsl_view, z_up, r_refdef.camera_inverse);
Enable face culling and depth testing. I spent way too long trying to figure out why triangle order wasn't making any difference... :P
2012-01-03 09:08:01 +00:00
Rename the glsl qfgl functions to qfegl. Keep them separate from the gl renderer :)
2012-02-22 07:48:57 +00:00
qfeglEnable (GL_CULL_FACE);
qfeglEnable (GL_DEPTH_TEST);
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
}
Make a start on getting sprites rendering. The plan is to do interpolated sprites based on a discussion I had with LordHavoc about them: blending between the two sprite frames. He didn't mention it, but it looks like blending between the sprite frames' verts is necessary too.
2011-12-30 12:11:59 +00:00
[renderer] Move most of the scene rendering into r_screen r_screen isn't really the right place, but it gets the scene rendering out of the low-level renderers and will make it easier to sort out later, and hopefully easier to figure out a good design for vulkan.
2022-03-17 08:50:38 +00:00
void
glsl_R_RenderEntities (entqueue_t *queue)
Make a start on getting sprites rendering. The plan is to do interpolated sprites based on a discussion I had with LordHavoc about them: blending between the two sprite frames. He didn't mention it, but it looks like blending between the sprite frames' verts is necessary too.
2011-12-30 12:11:59 +00:00
{
Avoid some unnecessary state changes. Doesn't make much difference but it doesn't hurt.
2012-07-03 09:20:32 +00:00
int begun;
Make a start on getting sprites rendering. The plan is to do interpolated sprites based on a discussion I had with LordHavoc about them: blending between the two sprite frames. He didn't mention it, but it looks like blending between the sprite frames' verts is necessary too.
2011-12-30 12:11:59 +00:00
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
if (!r_drawentities)
Make a start on getting sprites rendering. The plan is to do interpolated sprites based on a discussion I had with LordHavoc about them: blending between the two sprite frames. He didn't mention it, but it looks like blending between the sprite frames' verts is necessary too.
2011-12-30 12:11:59 +00:00
return;
Avoid some unnecessary state changes. Doesn't make much difference but it doesn't hurt.
2012-07-03 09:20:32 +00:00
#define RE_LOOP(type_name, Type) \
do { \
begun = 0; \
[renderer] Move most of the scene rendering into r_screen r_screen isn't really the right place, but it gets the scene rendering out of the low-level renderers and will make it easier to sort out later, and hopefully easier to figure out a good design for vulkan.
2022-03-17 08:50:38 +00:00
for (size_t i = 0; i < queue->ent_queues[mod_##type_name].size; \
[renderer] Support multiple entity queues While there's currently only the one still, this will allow the entities to be multiply queued for multi-pass rendering (eg, shadows). As the avoidance of putting an entity in the same queue more than once relies on the entity id, all entities now come from the scene (which is stored in cl_world in the client code for nq and qw), thus the extensive changes in the clients.
2022-03-04 16:48:10 +00:00
i++) { \
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
entity_t ent = queue->ent_queues[mod_##type_name].a[i]; \
Avoid some unnecessary state changes. Doesn't make much difference but it doesn't hurt.
2012-07-03 09:20:32 +00:00
if (!begun) { \
glsl_R_##Type##Begin (); \
begun = 1; \
} \
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
glsl_R_Draw##Type (ent); \
Avoid some unnecessary state changes. Doesn't make much difference but it doesn't hurt.
2012-07-03 09:20:32 +00:00
} \
if (begun) \
glsl_R_##Type##End (); \
} while (0)
RE_LOOP (alias, Alias);
RE_LOOP (iqm, IQM);
RE_LOOP (sprite, Sprite);
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
}
Enable the view model.
2012-01-14 11:07:43 +00:00
static void
R_DrawViewModel (void)
{
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
entity_t ent = vr_data.view_model;
renderer_t *renderer = Ent_GetComponent (ent.id, scene_renderer,
r_refdef.scene->reg);
Take the first step towards render plugins. No clients link. Even if they did, nothing would work.
2012-02-14 08:28:09 +00:00
if (vr_data.inhibit_viewmodel
[cvar] Make cvars properly typed This is an extremely extensive patch as it hits every cvar, and every usage of the cvars. Cvars no longer store the value they control, instead, they use a cexpr value object to reference the value and specify the value's type (currently, a null type is used for strings). Non-string cvars are passed through cexpr, allowing expressions in the cvars' settings. Also, cvars have returned to an enhanced version of the original (id quake) registration scheme. As a minor benefit, relevant code having direct access to the cvar-controlled variables is probably a slight optimization as it removed a pointer dereference, and the variables can be located for data locality. The static cvar descriptors are made private as an additional safety layer, though there's nothing stopping external modification via Cvar_FindVar (which is needed for adding listeners). While not used yet (partly due to working out the design), cvars can have a validation function. Registering a cvar allows a primary listener (and its data) to be specified: it will always be called first when the cvar is modified. The combination of proper listeners and direct access to the controlled variable greatly simplifies the more complex cvar interactions as much less null checking is required, and there's no need for one cvar's callback to call another's. nq-x11 is known to work at least well enough for the demos. More testing will come.
2022-04-23 03:22:45 +00:00
|| !r_drawviewmodel
|| !r_drawentities
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
|| !renderer->model)
Enable the view model.
2012-01-14 11:07:43 +00:00
return;
// hack the depth range to prevent view model from poking into walls
Rename the glsl qfgl functions to qfegl. Keep them separate from the gl renderer :)
2012-02-22 07:48:57 +00:00
qfeglDepthRangef (0, 0.3);
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_AliasBegin ();
[renderer] Remove currententity from non-sw renderers Really needed only for vulkan, but removing currententity from gl and glsl made testing easier.
2021-07-22 06:39:28 +00:00
glsl_R_DrawAlias (ent);
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_AliasEnd ();
Rename the glsl qfgl functions to qfegl. Keep them separate from the gl renderer :)
2012-02-22 07:48:57 +00:00
qfeglDepthRangef (0, 1);
Enable the view model.
2012-01-14 11:07:43 +00:00
}
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
void
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_RenderView (void)
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
{
[renderer] move r_worldentity and r_viewleaf into refdef More cleanup of globals that seem to be quake specific.
2022-03-14 06:27:43 +00:00
if (!r_refdef.worldmodel) {
[renderer] Make R_RenderView private This is actually a better solution to the renderer directly accessing client code than provided by 7e078c7f9c8ab27af92ff268f49bac070c9ff617. Essentially, V_RenderView should not have been calling R_RenderView, and CL_UpdateScreen should have been calling V_RenderView directly. The issue was that the renderers expected the world entity model to be valid at all times. Now, R_RenderView checks the world entity model's validity and immediately bails if it is not, and R_ClearState (which is called whenever the client disconnects and thus no longer has a world to render) clears the world entity model. Thus R_RenderView can (and is) now called unconditionally from within the renderer, simplifying renderer-specific variants.
2021-12-02 09:30:57 +00:00
return;
}
[renderer] Clean up FOV and viewport handling Viewport and FOV updates are now separate so updating one doesn't cause recalculations of the other. Also, perspective setup is now done directly from the tangents of the half angles for fov_x and fov_y making the renderers independent of fov/aspect mode. I imagine things are a bit of a mess with view size changes, and especially screen size changes (not supported yet anyway), and vulkan winds up updating its projection matrices every frame, but everything that's expected to work does (vulkan errors out for fisheye or warp due to frame buffer creation not being supported yet).
2022-03-30 05:55:32 +00:00
memcpy (glsl_projection, glsl_ctx->projection, sizeof (mat4f_t));
Hopefully get the 3d view and projection transforms setup.
2011-12-30 12:10:24 +00:00
R_SetupView ();
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_DrawWorld ();
glsl_R_DrawSky ();
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
if (Entity_Valid (vr_data.view_model)) {
[renderer] Don't try to draw a nonexistent view model Doing so doesn't end well (segfault). This is a bit of a hack until I come up with a design for configurable scene rendering.
2022-04-25 22:22:45 +00:00
R_DrawViewModel ();
}
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
}
[renderer] Remove namehack.h Finally. I never liked it (felt bad adding it in the first place), and it has caused confusion with function and global variable names, but it did let me get the render plugins working.
2022-03-14 05:31:23 +00:00
static void
glsl_R_TimeRefresh_f (void)
{
/* FIXME update for simd
double start, stop, time;
int i;
glsl_ctx->end_rendering ();
start = Sys_DoubleTime ();
for (i = 0; i < 128; i++) {
r_refdef.viewangles[1] = i * (360.0 / 128.0);
glsl_R_RenderView ();
glsl_ctx->end_rendering ();
}
stop = Sys_DoubleTime ();
time = stop - start;
Sys_Printf ("%g seconds (%g fps)\n", time, 128 / time);
*/
}
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
void
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_Init (void)
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
{
Add timerefresh to the glsl renderer. Also, tweak the formatting of the output for the other renderers (%g instead of %f) and make gl's timerefresh output unconditional.
2013-02-18 04:57:45 +00:00
Cmd_AddCommand ("timerefresh", glsl_R_TimeRefresh_f,
"Test the current refresh rate for the current location.");
Separate render module loading from initialization. This allows the vid module to load the render module and access render specific functions before the renderer initializes, which happens to need an initialized vid module...
2012-04-10 04:27:53 +00:00
R_Init_Cvars ();
Fix the calls for Draw_Init in the gl renderers. While namehack.h took care of the symbol mangling, I do prefer the calls to be correct as it reduces confusion.
2013-02-19 05:45:50 +00:00
glsl_Draw_Init ();
Make the init process more dependency based. Most subsystems that depend on other subsystems now call the init functions themselves. This makes for much cleaner client initialization (more work needs to be done for the server).
2012-02-01 12:52:47 +00:00
SCR_Init ();
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_InitBsp ();
glsl_R_InitAlias ();
Begin work on rendering iqm models. No chance of working yet, but the shaders compile :)
2012-05-11 03:49:14 +00:00
glsl_R_InitIQM ();
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_InitSprites ();
glsl_R_InitParticles ();
[glsl] Implement fisheye rendering The code dealing with state is a bit of a mess, but everything is working nicely. Get around 400fps when all 6 faces need to be rendered (no surprise: it should be about 1/6 of that for normal rendering). The messy state handling code did not come as a surprise as I suspected there were various mistakes in my scene rendering "recipe", and fisheye highlighted them nicely (I'm sure getting this stuff working in Vulkan will highlight even more issues).
2022-03-25 03:22:16 +00:00
glsl_InitFisheye ();
[glsl] Implement screen warp when in liquids Finally, after a decade :P Looks pretty good, too, and is (almost) properly scaled to the resolution (almost because the effect is a little squashed, but I think the sw renderer does the same).
2022-03-24 16:24:38 +00:00
glsl_InitWarp ();
Separate render module loading from initialization. This allows the vid module to load the render module and access render specific functions before the renderer initializes, which happens to need an initialized vid module...
2012-04-10 04:27:53 +00:00
Skin_Init ();
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
}
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
void
[renderer] Use scene_t to set the model data This replaces *_NewMap with *_NewScene and adds SCR_NewScene to handle loading a new map (for quake) in the renderer, and will eventually be how any new scene is loaded.
2022-05-05 05:41:46 +00:00
glsl_R_NewScene (scene_t *scene)
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
{
Initialize d_lightstylevalue. "Let there be light!", but chaos still reigns (broken lightmap updates).
2012-01-08 16:26:16 +00:00
int i;
for (i = 0; i < 256; i++)
d_lightstylevalue[i] = 264; // normal light value
[scene] Make entity_t just an entity id for ECS This puts the hierarchy (transform) reference, animation, visibility, renderer, active, and old_origin data in separate components. There are a few bugs (crashes on grenade explosions in gl/glsl/vulkan, immediately in sw, reasons known, missing brush models in vulkan). While quake doesn't really need an ECS, the direction I want to take QF does, and it does seem to have improved memory bandwidth a little (uncertain). However, there's a lot more work to go (especially fixing the above bugs), but this seems to be a good start.
2022-10-23 01:32:09 +00:00
r_refdef.scene = scene;
[renderer] Use scene_t to set the model data This replaces *_NewMap with *_NewScene and adds SCR_NewScene to handle loading a new map (for quake) in the renderer, and will eventually be how any new scene is loaded.
2022-05-05 05:41:46 +00:00
r_refdef.worldmodel = scene->worldmodel;
Get glsl running as a null renderer. This means that nq-glslx can get through demo1, demo2, demo3 and bigass1 without crashing. However, nothing is rendered, so unless you like black, it's not very interesting.
2011-12-25 03:57:23 +00:00
Fix the missing world on map reload. If the map got reloaded but the current leaf didn't change the world (and most entities) didn't get drawn. Forcing a vis update by first setting r_viewleaf to null and marking surfaces does the trick :)
2012-01-29 07:09:35 +00:00
// Force a vis update
[model] Move visframe out of msurface_t One more step towards BSP thread-safety. This one brought with it a very noticeable speed boost (ie, not lost in the noise) thanks to the face visframes being in tightly packed groups instead of 128 bytes apart, though the sw render's boost is lost in the noise (but it's very fill-rate limited).
2022-05-22 07:31:24 +00:00
R_MarkLeaves (0, 0, 0, 0);
Fix the missing world on map reload. If the map got reloaded but the current leaf didn't change the world (and most entities) didn't get drawn. Forcing a vis update by first setting r_viewleaf to null and marking surfaces does the trick :)
2012-01-29 07:09:35 +00:00
[particles] Merge particle spawning into client After yesterday's crazy marathon editing all the particles files, and starting to do another big change to them today, I realized that I really do need to merge them down. All the actual spawning is now in the client library (though particle insertion will need to be moved). GLSL particle rendering is semi-broken in that it now does only points (until I come up with a way to select between points and quads (probably a context object, which I need anyway for Vulkan)).
2021-12-19 04:08:39 +00:00
R_ClearParticles ();
[renderer] Use scene_t to set the model data This replaces *_NewMap with *_NewScene and adds SCR_NewScene to handle loading a new map (for quake) in the renderer, and will eventually be how any new scene is loaded.
2022-05-05 05:41:46 +00:00
glsl_R_RegisterTextures (scene->models, scene->num_models);
glsl_R_BuildLightmaps (scene->models, scene->num_models);
glsl_R_BuildDisplayLists (scene->models, scene->num_models);
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
}
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
void
[qw] Clean up netgraph somewhat The renderer's LineGraph now takes a height parameter, and netgraph now uses cl_* cvars instead of r_* (which never really made sense), including it's own height cvar (the render graphs still use r_graphheight).
2021-07-11 01:59:27 +00:00
glsl_R_LineGraph (int x, int y, int *h_vals, int count, int height)
Create stubs for most of the required render functions. nq-glslx almost links. Just some suspicious references in host.c I want to check before doing anything more.
2011-12-23 03:19:50 +00:00
{
}
Remove VISIBLE from the files that will go into the plugins.
2012-02-18 13:28:42 +00:00
void
Rename the public symbols for gl, glsl and sw32. Evil hack, but it does the job.
2012-02-22 07:32:34 +00:00
glsl_R_ClearState (void)
Put in the final pieces so nq-glslx can link. Everything is still stubs. Trying to run nq-glslx results in a segfault :)
2011-12-23 03:52:55 +00:00
{
[renderer] move r_worldentity and r_viewleaf into refdef More cleanup of globals that seem to be quake specific.
2022-03-14 06:27:43 +00:00
r_refdef.worldmodel = 0;
Put in the final pieces so nq-glslx can link. Everything is still stubs. Trying to run nq-glslx results in a segfault :)
2011-12-23 03:52:55 +00:00
R_ClearEfrags ();
R_ClearDlights ();
[particles] Merge particle spawning into client After yesterday's crazy marathon editing all the particles files, and starting to do another big change to them today, I realized that I really do need to merge them down. All the actual spawning is now in the client library (though particle insertion will need to be moved). GLSL particle rendering is semi-broken in that it now does only points (until I come up with a way to select between points and quads (probably a context object, which I need anyway for Vulkan)).
2021-12-19 04:08:39 +00:00
R_ClearParticles ();
Put in the final pieces so nq-glslx can link. Everything is still stubs. Trying to run nq-glslx results in a segfault :)
2011-12-23 03:52:55 +00:00
}
Reference in a new issue Copy permalink