]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - render.h
UNMERGE
[xonotic/darkplaces.git] / render.h
index 7a5f846666762a8cbc27313010ca453beb7cb9d8..00a93ed9ccf82b8f733bf1e9aa7118f54a76893d 100644 (file)
--- a/render.h
+++ b/render.h
@@ -500,8 +500,11 @@ typedef enum gl20_texunit_e
        // conflicts with lightmap/deluxemap
        GL20TU_ATTENUATION = 9,
        GL20TU_CUBE = 10,
-       GL20TU_SHADOWMAP2D = 15,
+       GL20TU_SHADOWMAP2D = 11,
        GL20TU_CUBEPROJECTION = 12,
+       // orthographic-projection shadowmapping
+       GL20TU_SHADOWMAPORTHORECT = 15,
+       GL20TU_SHADOWMAPORTHO2D = 15,
        // rtlight prepass data (screenspace depth and normalmap)
        GL20TU_SCREENDEPTH = 13,
        GL20TU_SCREENNORMALMAP = 14,