X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_shadow.h;h=25e6ce0f0126beef2d8bc33e68cf71b4e37ab0e8;hb=c38d0d2d6409d9b3174b6cf04f1bd09694cbfc81;hp=809805eb52a429f3e94ce132a48125fb27186d6e;hpb=4e1f3f76d5fe7befe20034a730630c314d45956b;p=xonotic%2Fdarkplaces.git

diff --git a/r_shadow.h b/r_shadow.h
index 809805eb..25e6ce0f 100644
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -2,6 +2,8 @@
 #ifndef R_SHADOW_H
 #define R_SHADOW_H
 
+#include "taskqueue.h"
+
 #define R_SHADOW_SHADOWMAP_NUMCUBEMAPS 8
 
 extern cvar_t r_shadow_bumpscale_basetexture;
@@ -31,17 +33,11 @@ extern cvar_t r_shadow_realtime_world_compileshadow;
 extern cvar_t r_shadow_realtime_world_compilesvbsp;
 extern cvar_t r_shadow_realtime_world_compileportalculling;
 extern cvar_t r_shadow_scissor;
-extern cvar_t r_shadow_polygonfactor;
-extern cvar_t r_shadow_polygonoffset;
-extern cvar_t r_shadow_texture3d;
-extern cvar_t gl_ext_separatestencil;
-extern cvar_t gl_ext_stenciltwoside;
 
 // used by shader for bouncegrid feature
 typedef struct r_shadow_bouncegrid_settings_s
 {
 	qboolean staticmode;
-	qboolean bounceanglediffuse;
 	qboolean directionalshading;
 	qboolean includedirectlighting;
 	qboolean blur;
@@ -51,8 +47,7 @@ typedef struct r_shadow_bouncegrid_settings_s
 	qboolean hitmodels;
 	float lightradiusscale;
 	int maxbounce;
-	float lightpathsize_initial;
-	float lightpathsize_conespread;
+	float lightpathsize;
 	float particlebounceintensity;
 	float particleintensity;
 	int maxphotons;
@@ -61,9 +56,35 @@ typedef struct r_shadow_bouncegrid_settings_s
 	int rng_type;
 	int rng_seed;
 	float bounceminimumintensity2;
+	int subsamples;
 }
 r_shadow_bouncegrid_settings_t;
 
+#define PHOTON_MAX_PATHS 11
+
+typedef struct r_shadow_bouncegrid_photon_path_s
+{
+	vec3_t start;
+	vec3_t end;
+	vec3_t color;
+}
+r_shadow_bouncegrid_photon_path_t;
+
+typedef struct r_shadow_bouncegrid_photon_s
+{
+	// parameters for tracing this photon
+	vec3_t start;
+	vec3_t end;
+	float color[3];
+	float bounceminimumintensity2;
+	float startrefractiveindex;
+
+	// results
+	int numpaths;
+	r_shadow_bouncegrid_photon_path_t paths[PHOTON_MAX_PATHS];
+}
+r_shadow_bouncegrid_photon_t;
+
 typedef struct r_shadow_bouncegrid_state_s
 {
 	r_shadow_bouncegrid_settings_t settings;
@@ -85,16 +106,27 @@ typedef struct r_shadow_bouncegrid_state_s
 	vec3_t mins;
 	vec3_t maxs;
 	vec3_t size;
-	int maxsplatpaths;
 
 	// per-frame data that is very temporary
-	int numsplatpaths;
-	struct r_shadow_bouncegrid_splatpath_s *splatpaths;
 	int highpixels_index; // which one is active - this toggles when doing blur
 	float *highpixels; // equals blurpixels[highpixels_index]
 	float *blurpixels[2];
 	unsigned char *u8pixels; // temporary processing buffer when outputting to rgba8 format
 	unsigned short *fp16pixels; // temporary processing buffer when outputting to rgba16f format
+								// describe the photons we intend to shoot for threaded dispatch
+	int numphotons; // number of photons to shoot this frame, always <= settings.maxphotons
+	r_shadow_bouncegrid_photon_t *photons; // describes the photons being shot this frame
+
+	// tasks
+	taskqueue_task_t cleartex_task; // clears the highpixels array
+	taskqueue_task_t assignphotons_task; // sets the photon counts on lights, etc
+	taskqueue_task_t enqueuephotons_task; // enqueues tasks to shoot the photons
+	taskqueue_task_t *photons_tasks; // [maxphotons] taskqueue entries to perform the photon shots
+	taskqueue_task_t photons_done_task; // checks that all photon shots are completed
+	taskqueue_task_t enqueue_slices_task; // enqueues slice tasks to render the light accumulation into the texture
+	taskqueue_task_t *slices_tasks; // [resolution[1]] taskqueue entries to perform the light path accumulation into the texture
+	taskqueue_task_t slices_done_task; // checks that light accumulation in the texture is done
+	taskqueue_task_t blurpixels_task; // blurs the highpixels array
 }
 r_shadow_bouncegrid_state_t;
 
@@ -102,9 +134,7 @@ extern r_shadow_bouncegrid_state_t r_shadow_bouncegrid_state;
 
 void R_Shadow_Init(void);
 qboolean R_Shadow_ShadowMappingEnabled(void);
-void R_Shadow_VolumeFromList(int numverts, int numtris, const float *invertex3f, const int *elements, const int *neighbors, const vec3_t projectorigin, const vec3_t projectdirection, float projectdistance, int nummarktris, const int *marktris, vec3_t trismins, vec3_t trismaxs);
 void R_Shadow_ShadowMapFromList(int numverts, int numtris, const float *vertex3f, const int *elements, int numsidetris, const int *sidetotals, const unsigned char *sides, const int *sidetris);
-void R_Shadow_MarkVolumeFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const vec3_t projectorigin, const vec3_t projectdirection, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs);
 int R_Shadow_CalcTriangleSideMask(const vec3_t p1, const vec3_t p2, const vec3_t p3, float bias);
 int R_Shadow_CalcSphereSideMask(const vec3_t p1, float radius, float bias);
 int R_Shadow_ChooseSidesFromBox(int firsttriangle, int numtris, const float *invertex3f, const int *elements, const matrix4x4_t *worldtolight, const vec3_t projectorigin, const vec3_t projectdirection, const vec3_t lightmins, const vec3_t lightmaxs, const vec3_t surfacemins, const vec3_t surfacemaxs, int *totals);
@@ -112,11 +142,9 @@ void R_Shadow_RenderLighting(int texturenumsurfaces, const msurface_t **textures
 void R_Shadow_RenderMode_Begin(void);
 void R_Shadow_RenderMode_ActiveLight(const rtlight_t *rtlight);
 void R_Shadow_RenderMode_Reset(void);
-void R_Shadow_RenderMode_StencilShadowVolumes(qboolean zpass);
-void R_Shadow_RenderMode_Lighting(qboolean stenciltest, qboolean transparent, qboolean shadowmapping, qboolean noselfshadowpass);
+void R_Shadow_RenderMode_Lighting(qboolean transparent, qboolean shadowmapping, qboolean noselfshadowpass);
 void R_Shadow_RenderMode_DrawDeferredLight(qboolean shadowmapping);
-void R_Shadow_RenderMode_VisibleShadowVolumes(void);
-void R_Shadow_RenderMode_VisibleLighting(qboolean stenciltest, qboolean transparent);
+void R_Shadow_RenderMode_VisibleLighting(qboolean transparent);
 void R_Shadow_RenderMode_End(void);
 void R_Shadow_ClearStencil(void);
 void R_Shadow_SetupEntityLight(const entity_render_t *ent);
@@ -135,7 +163,7 @@ void R_RTLight_Update(rtlight_t *rtlight, int isstatic, matrix4x4_t *matrix, vec
 void R_RTLight_Compile(rtlight_t *rtlight);
 void R_RTLight_Uncompile(rtlight_t *rtlight);
 
-void R_Shadow_PrepareLights(int fbo, rtexture_t *depthtexture, rtexture_t *colortexture);
+void R_Shadow_PrepareLights(void);
 void R_Shadow_ClearShadowMapTexture(void);
 void R_Shadow_DrawPrepass(void);
 void R_Shadow_DrawLights(void);
@@ -162,6 +190,5 @@ void R_Shadow_PrepareModelShadows(void);
 void R_CompleteLightPoint(float *ambient, float *diffuse, float *lightdir, const vec3_t p, const int flags, float lightmapintensity, float ambientintensity);
 
 void R_Shadow_DrawShadowMaps(void);
-void R_Shadow_DrawModelShadows(void);
 
 #endif