From 7e656fa4ef60eb32b409ad1444c500f09ea684af Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Fri, 20 Dec 2013 19:51:17 -0800 Subject: [PATCH] Added GL 3.1 core profile shader patching. --- examples/runtime/shaders/glsl/fs_bump.bin | Bin 4049 -> 4035 bytes examples/runtime/shaders/glsl/fs_callback.bin | Bin 445 -> 431 bytes examples/runtime/shaders/glsl/fs_cubes.bin | Bin 91 -> 77 bytes examples/runtime/shaders/glsl/fs_hdr_blur.bin | Bin 720 -> 706 bytes .../runtime/shaders/glsl/fs_hdr_bright.bin | Bin 1925 -> 1911 bytes examples/runtime/shaders/glsl/fs_hdr_lum.bin | Bin 2070 -> 2056 bytes .../runtime/shaders/glsl/fs_hdr_lumavg.bin | Bin 2698 -> 2684 bytes examples/runtime/shaders/glsl/fs_hdr_mesh.bin | Bin 1503 -> 1489 bytes .../runtime/shaders/glsl/fs_hdr_skybox.bin | Bin 580 -> 566 bytes .../runtime/shaders/glsl/fs_hdr_tonemap.bin | Bin 2160 -> 2146 bytes .../runtime/shaders/glsl/fs_instancing.bin | Bin 91 -> 77 bytes examples/runtime/shaders/glsl/fs_mesh.bin | Bin 1217 -> 1203 bytes .../runtime/shaders/glsl/fs_raymarching.bin | 4 +-- .../glsl/fs_shadowvolume_color_lightning.bin | Bin 1712 -> 1698 bytes .../glsl/fs_shadowvolume_color_texture.bin | Bin 566 -> 552 bytes .../glsl/fs_shadowvolume_svbackblank.bin | Bin 84 -> 70 bytes .../glsl/fs_shadowvolume_svbackcolor.bin | Bin 122 -> 108 bytes .../glsl/fs_shadowvolume_svbacktex1.bin | Bin 403 -> 389 bytes .../glsl/fs_shadowvolume_svbacktex2.bin | Bin 403 -> 389 bytes .../glsl/fs_shadowvolume_svfrontblank.bin | Bin 107 -> 93 bytes .../glsl/fs_shadowvolume_svfrontcolor.bin | Bin 122 -> 108 bytes .../glsl/fs_shadowvolume_svfronttex1.bin | Bin 400 -> 386 bytes .../glsl/fs_shadowvolume_svfronttex2.bin | Bin 400 -> 386 bytes .../shaders/glsl/fs_shadowvolume_svside.bin | Bin 424 -> 410 bytes .../glsl/fs_shadowvolume_svsideblank.bin | Bin 84 -> 70 bytes .../glsl/fs_shadowvolume_svsidecolor.bin | Bin 122 -> 108 bytes .../glsl/fs_shadowvolume_svsidetex.bin | Bin 503 -> 489 bytes .../shaders/glsl/fs_shadowvolume_texture.bin | Bin 151 -> 137 bytes .../fs_shadowvolume_texture_lightning.bin | Bin 1926 -> 1912 bytes .../shaders/glsl/fs_stencil_color_black.bin | Bin 84 -> 70 bytes .../glsl/fs_stencil_color_lightning.bin | Bin 1852 -> 1838 bytes .../shaders/glsl/fs_stencil_color_texture.bin | Bin 566 -> 552 bytes .../shaders/glsl/fs_stencil_texture.bin | Bin 151 -> 137 bytes .../glsl/fs_stencil_texture_lightning.bin | Bin 2088 -> 2074 bytes examples/runtime/shaders/glsl/fs_tree.bin | Bin 1091 -> 1077 bytes examples/runtime/shaders/glsl/fs_update.bin | Bin 153 -> 139 bytes .../runtime/shaders/glsl/fs_update_cmp.bin | Bin 170 -> 156 bytes examples/runtime/shaders/glsl/vs_bump.bin | Bin 1557 -> 1543 bytes .../shaders/glsl/vs_bump_instanced.bin | Bin 1734 -> 1720 bytes examples/runtime/shaders/glsl/vs_callback.bin | Bin 436 -> 422 bytes examples/runtime/shaders/glsl/vs_cubes.bin | Bin 281 -> 267 bytes examples/runtime/shaders/glsl/vs_hdr_blur.bin | Bin 1267 -> 1253 bytes .../runtime/shaders/glsl/vs_hdr_bright.bin | Bin 293 -> 279 bytes examples/runtime/shaders/glsl/vs_hdr_lum.bin | Bin 293 -> 279 bytes .../runtime/shaders/glsl/vs_hdr_lumavg.bin | Bin 293 -> 279 bytes examples/runtime/shaders/glsl/vs_hdr_mesh.bin | Bin 619 -> 605 bytes .../runtime/shaders/glsl/vs_hdr_skybox.bin | Bin 293 -> 279 bytes .../runtime/shaders/glsl/vs_hdr_tonemap.bin | Bin 1281 -> 1267 bytes .../runtime/shaders/glsl/vs_instancing.bin | Bin 527 -> 513 bytes examples/runtime/shaders/glsl/vs_mesh.bin | Bin 1313 -> 1299 bytes .../runtime/shaders/glsl/vs_raymarching.bin | Bin 364 -> 350 bytes .../glsl/vs_shadowvolume_color_lightning.bin | Bin 689 -> 675 bytes .../glsl/vs_shadowvolume_color_texture.bin | Bin 293 -> 279 bytes .../shaders/glsl/vs_shadowvolume_svback.bin | Bin 360 -> 346 bytes .../shaders/glsl/vs_shadowvolume_svfront.bin | Bin 210 -> 196 bytes .../shaders/glsl/vs_shadowvolume_svside.bin | Bin 522 -> 508 bytes .../shaders/glsl/vs_shadowvolume_texture.bin | Bin 293 -> 279 bytes .../vs_shadowvolume_texture_lightning.bin | Bin 772 -> 758 bytes .../runtime/shaders/glsl/vs_stencil_color.bin | Bin 210 -> 196 bytes .../glsl/vs_stencil_color_lightning.bin | Bin 539 -> 525 bytes .../shaders/glsl/vs_stencil_color_texture.bin | Bin 293 -> 279 bytes .../shaders/glsl/vs_stencil_texture.bin | Bin 293 -> 279 bytes .../glsl/vs_stencil_texture_lightning.bin | Bin 622 -> 608 bytes examples/runtime/shaders/glsl/vs_tree.bin | Bin 717 -> 703 bytes examples/runtime/shaders/glsl/vs_update.bin | Bin 293 -> 279 bytes src/glimports.h | 3 +- src/renderer_gl.cpp | 29 ++++++++++++++++++ tools/shaderc/shaderc.cpp | 4 +-- 68 files changed, 34 insertions(+), 6 deletions(-) diff --git a/examples/runtime/shaders/glsl/fs_bump.bin b/examples/runtime/shaders/glsl/fs_bump.bin index 6bce30ecacc8e83b18a81387ad9b9fe1b199df83..053fa60f240044b3c3f276056f7bba43913c81cf 100644 GIT binary patch delta 17 Zcmca8e^{QwE!cz6^2EGH8^w0>0{}Y&2G0Nh delta 31 ncmX>se^Fk{E!cz6^2EGH%4MlV#hLke3Wi1oTwEJDcJl)OxVj3z diff --git a/examples/runtime/shaders/glsl/fs_callback.bin b/examples/runtime/shaders/glsl/fs_callback.bin index 3fc0567614762beba9275f10736e510dc1d43822..cd33eb5688fe23b65f7838cee66828ba0d841bbc 100644 GIT binary patch delta 17 ZcmdnXyq=lEE!cyxW$~Rq8^xA00suHs2Fm~d delta 31 ncmZ3_yq8(bE!cyxW$~Rq%4MlV#hLke3Wi1oTwEJDmNNnXx2p=f diff --git a/examples/runtime/shaders/glsl/fs_cubes.bin b/examples/runtime/shaders/glsl/fs_cubes.bin index f05e6f27e21d51cbedf51e26f259f4e5ac30b454..693031755e1ddd134dcb771d8711cc45c2f8ab7d 100644 GIT binary patch delta 14 Vcma#{sU|iDu-cz|OwWv5VKTpBX$bgG$B8MvgiS7v2 diff --git a/examples/runtime/shaders/glsl/fs_hdr_blur.bin b/examples/runtime/shaders/glsl/fs_hdr_blur.bin index 7316402059d4628cee9559cd90c664810c12b302..150c06b64c14c5e5c7ffd6204f730bd5ae8dc94d 100644 GIT binary patch delta 17 Zcmcb>dWe<7E!czc_T%4gHj3?H0sueu2d@AC delta 31 ncmX@adVy8UE!czc_T%4gl*>|!iZk=`6by|FxVScQ>|z1{%CHNc diff --git a/examples/runtime/shaders/glsl/fs_hdr_bright.bin b/examples/runtime/shaders/glsl/fs_hdr_bright.bin index 4c003c87f0b86e73b450a18f52fc685e843e03f4..eff7591b584f60a9467df4d4b5e7c0738f1d9d64 100644 GIT binary patch delta 17 YcmZqW|IWwZ7VN>8FK1`7Q7oSw04@Rq$N&HU delta 31 mcmey)*UB&E7VN>8FK1_?T$Wl?oSC1eU}$8(#kG+mpB(^{>_I#7VN>8FK1`7P>cfrBgzBs delta 30 lcmeAWm?j|R7VN>8FK1_?T$Wl?oSC1eU}$8(#kG)w0|0=`2j2hy diff --git a/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin b/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin index 58a8bcd33c63610d7f8b58f7e90ed20ffcb0af67..13de50fa0c857abbfe58f9f02576e0f9a6f49a79 100644 GIT binary patch delta 17 YcmeAY{UgHR7VN>8FK1`7QLKau054+%<^TWy delta 31 mcmew((j_Y97VN>8FK1_?T$Wl?oSC1eU}$8(#kG;6gbM(dfe6+B diff --git a/examples/runtime/shaders/glsl/fs_hdr_mesh.bin b/examples/runtime/shaders/glsl/fs_hdr_mesh.bin index 73025c9aec18993c1c5b6bf5f2a5648c297f5e0a..c7752bb3966722dd86eafdb0d5d8becc9c943b6f 100644 GIT binary patch delta 17 Ycmcc5eUY2PE!cz6Y^_k&MzNEu05quu#Q*>R delta 31 mcmcb}eV<#*E!cz6Y^_k2a#?Coab|v=f}xQC7uQCPldJ%vn+df5 diff --git a/examples/runtime/shaders/glsl/fs_hdr_skybox.bin b/examples/runtime/shaders/glsl/fs_hdr_skybox.bin index bce60058fcd9b0340a259c2fa460d74abc19f8de..ccb56558931bf8886c9169deae33f9e561fef400 100644 GIT binary patch delta 17 YcmX@YvW|!iZk=`6by|FxF$MCY?OEA008cn40!+m diff --git a/examples/runtime/shaders/glsl/fs_instancing.bin b/examples/runtime/shaders/glsl/fs_instancing.bin index f05e6f27e21d51cbedf51e26f259f4e5ac30b454..693031755e1ddd134dcb771d8711cc45c2f8ab7d 100644 GIT binary patch delta 14 Vcma#{sU|iDu-cz|OwWv5VKTpBX$bgG$B8MvgiS7v2 diff --git a/examples/runtime/shaders/glsl/fs_mesh.bin b/examples/runtime/shaders/glsl/fs_mesh.bin index 9ff6afbba9e1687d266172a7b650e215a6f43ae7..f66aa293a4b85e7d41e6c5cc6b809555ae20a32d 100644 GIT binary patch delta 17 ZcmX@extWv0E!cx`>Ri{~8^u<$001^$23Y_A delta 31 ncmdnYd5}}gE!cx`>Ri{~%4MlV#hLke3Wi1oTwEJDRz>% delta 31 mcmZ3%vW-Q|E!cxGU(U`(xh%D)I5R&_!O+Nni)$l?0uum@<8TZ1U}OM-iDGsD6M+J1 delta 28 hcmZ<@5pxUnU}OLS<+9YG;>`R!1w$hPF0P3jb^uv723i0B diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin index aeac0a8fffa020953374cfc67ce056a75a84bb60..111977a20678702c9abfb31cc712eea94d92fbc5 100644 GIT binary patch delta 14 Tcmb=*;cyG~U}OM-iDD@L7pVf= delta 28 hcmd0)5_1doU}OLS<+9YG;>`R!1w$hPF0P3jDF9)I2Fw5e diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin index 8676decfba298b7550b879cbb1faa2aa27e031b8..64a9fd9ea42a522c15a2018f4e7d07e18d9b901c 100644 GIT binary patch delta 17 WcmbQt+{(=17VN>u00bMwY8e3_6a!8G delta 31 kcmZo=p3E%f7VN>u00hcqsYS(^`FRS4Mh0A58#!tj0dV98J^%m! diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin index 956b55566120cc8ef18a6240643d38e19a4e278a..227aec935d268b19443bbbe9fd7828abde284963 100644 GIT binary patch delta 17 WcmbQt+{(=17VN>u00bMwY8e3_6a!8G delta 31 kcmZo=p3E%f7VN>u00hcqsYS(^`FRS4Mh0A58#!tj0dV98J^%m! diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin index c984c5311d86df19e64d91b66b277d4579d9562c..2a84c9598d8165ca42ff0824f9d9ae75cac4178e 100644 GIT binary patch delta 14 Tcmd0fsU}OLS<+9YG;>`R!1w$hPF0P3jp#WY#2A==` diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin index aeac0a8fffa020953374cfc67ce056a75a84bb60..111977a20678702c9abfb31cc712eea94d92fbc5 100644 GIT binary patch delta 14 Tcmb=*;cyG~U}OM-iDD@L7pVf= delta 28 hcmd0)5_1doU}OLS<+9YG;>`R!1w$hPF0P3jDF9)I2Fw5e diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin index 5a980a0a47db9419bacab79d8124d78af007a1e7..a46c596c90d3573839b7fd43711e4b6139c9f7d1 100644 GIT binary patch delta 17 WcmbQh+{Db`7VN>u00bMwsu%$ut^-8? delta 31 kcmZo-p1>^T7VN>u00hcqsYS(^`FRS4Mh0A58#$^N0dOh@H2?qr diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin index dac853d63c1ac081c81609d5fe0d0421a7bd8d0a..7c2dc8b1c05cdfda88fc38e0b6650816b4c84e1a 100644 GIT binary patch delta 17 WcmbQh+{Db`7VN>u00bMwsu%$ut^-8? delta 31 kcmZo-p1>^T7VN>u00hcqsYS(^`FRS4Mh0A58#$^N0dOh@H2?qr diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin index c4a581a4b068f6dc13a2f363f19df29183926b10..64bab921ea437e0726d98f6d2542c20f83ea7a01 100644 GIT binary patch delta 17 ZcmZ3%Jd2sbE!cx`@Aj|R8^tCu0su9f24MgI delta 31 ncmbQmyn<8TZ1VBEX?YxYDjI{+hV1wH@( delta 28 jcmZ<@5pxUnVBEX?YqoM(YEf}!ex8D%kpUOiL=HOukhuvi diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin index 5ac4def8fa88c75eda6417443ee1d8e04d6ce522..d7b63d322353ea6fe33e24bd76e9b078e98ce24c 100644 GIT binary patch delta 14 Vcmb=*;cyG~VBEX?YxYF36aXia1+V}B delta 28 jcmd0)5_1doVBEX?YqoM(YEf}!ex8D%kpUOiM2-{ynF$G? diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin index b23f208675f4c0c08c6c9e27f68c0481fb8de4bf..96fad0d237f1badec20dd23f1f277636011e795f 100644 GIT binary patch delta 17 Zcmey){F0f&E!cx`@Aj|R8^s8FK1^nQLGUFB8>z* delta 30 lcmeBVoX#lb7VN>8FK1_?T$Wl?oSC1eU}$8(#Wj(m5deM%2rK{q diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin index 02216c3da600ce59eeb2a752592163b88ee6d948..3a688f1e07d47b985d137a3a5ddeae4031e9407f 100644 GIT binary patch delta 17 YcmZqU|G~%M7VN?JGS{qoqgVku05y08+W-In delta 31 mcmeyt*TygA7VN?JGS{qIxh%D)I5R&_!O+Nni)$lC0XqPzUJ1(p diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_black.bin b/examples/runtime/shaders/glsl/fs_stencil_color_black.bin index a23bab00dd9c8877843a8523a80e16858a5cf361..d66f79aaf13a396a4adb9af04bfd5e8dfa958726 100644 GIT binary patch delta 14 TcmWG><8TZ1U}OM-iDGsD6M+J1 delta 28 hcmZ<@5pxUnU}OLS<+9YG;>`R!1w$hPF0P3jb^uv723i0B diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin b/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin index bbdde141c68aa4d76ca72389c9e7c3c29bc25651..e3b75388daf0eae75186ca8e0dfb8d45c66cd971 100644 GIT binary patch delta 17 YcmdnPw~mj)E!cxGsQR1OMlm&Z05SCiJ^%m! delta 31 mcmZ3-w}(&6E!cxGsQR0ja#?Coab|v=f}xQC7uQA(HFf}^Qwc5r diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin b/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin index 439cd0acd39fe644cbe771c24d4b85e1be14fba7..6eb00acedc630cc5f2cd9d50d0f67d2caab55e47 100644 GIT binary patch delta 17 YcmdnSvVw)fE!cxGU(U{EqnH8{04l=-K>z>% delta 31 mcmZ3%vW-Q|E!cxGU(U`(xh%D)I5R&_!O+Nni)$l?0uum@8FK1^nQLGUFB8>z* delta 30 lcmeBVoX#lb7VN>8FK1_?T$Wl?oSC1eU}$8(#Wj(m5deM%2rK{q diff --git a/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin b/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin index bfedaff4741f011b9fa37fa55bbcc14169f110d8..f681aa55f90d271099bb2e9d9c71c08cd2071ae6 100644 GIT binary patch delta 17 YcmZ1>FiU{LE!cyx&i9YcMlm4{05IAGK>z>% delta 31 mcmbOwutGr0E!cyx&i9Xxa#?Coab|v=f}xQC7uQA(Ar1hdYzZ*{ diff --git a/examples/runtime/shaders/glsl/fs_tree.bin b/examples/runtime/shaders/glsl/fs_tree.bin index ed502b2da9030ad035e0915b7be5ed246605ff0d..5dd43cb23a12a000dab38be4d29cd4228dec9728 100644 GIT binary patch delta 17 YcmX@iv6X|vE!czcWv*HGMloF$05nSlf&c&j delta 31 mcmdnWahOBQE!czcWv*Gba#?Coab|v=f}xQC7uQA(T^0bSDG71_ diff --git a/examples/runtime/shaders/glsl/fs_update.bin b/examples/runtime/shaders/glsl/fs_update.bin index a3158b1a647cc181b33391e028697bdcb3cb3cc1..40844d1255ebfb6ed7400cb5788436573eb6eb54 100644 GIT binary patch delta 16 XcmbQq*v-h{7VN>8FK1^nQLGsNBFh9q delta 30 lcmeBXoXIHW7VN>8FK1_?T$Wl?oSC1eU}$8(#Wj(m832BL2r>Ww diff --git a/examples/runtime/shaders/glsl/fs_update_cmp.bin b/examples/runtime/shaders/glsl/fs_update_cmp.bin index f2bc53f9a3f8124a117cf7de2398f6718b484147..391304c05d14ed3c63ae11edbd93ede49451d574 100644 GIT binary patch delta 16 XcmZ3*IERtLE!cxGU(U{EqSzDwB-#XZ delta 30 lcmbQkxQbECE!cxGU(U`(xh%D)I5R&_!O+Nni)$js6aa!~2xR~O diff --git a/examples/runtime/shaders/glsl/vs_bump.bin b/examples/runtime/shaders/glsl/vs_bump.bin index 280a64fb776fd95a9c26239967b29a972f07d43c..2c6679972a46b2d7178ac80256044b5870a2360f 100644 GIT binary patch delta 17 YcmbQr)6T;Y7VN=jd1Bt9jbi^<0WydNdjJ3c delta 31 mcmZqYnaU#;7VN=jd1Brp<+9YG;>`R!1w$hPF0PFn|5*X3dJ1a* diff --git a/examples/runtime/shaders/glsl/vs_bump_instanced.bin b/examples/runtime/shaders/glsl/vs_bump_instanced.bin index 92ce52295f099465572b620d0d23ed54781c0c74..8ad62fde72de161855d289dc036d87a78a0b4f36 100644 GIT binary patch delta 17 ZcmX@cyMvb_EZBq5^2EGH8^t!T0RT8D29W>& delta 33 pcmdnNdyH2!EZBq5^2EGH%4MlV#hLke3Wi1oToV;UHcHQB0|3f`3p)S+ diff --git a/examples/runtime/shaders/glsl/vs_callback.bin b/examples/runtime/shaders/glsl/vs_callback.bin index d6c318d85b01f28ae8765e6cc3a905183ad4c55f..c1722ec33f65efb8da819c6edce7170da2e4d0c5 100644 GIT binary patch delta 17 ZcmdnOyo{M6EZBpwW$~Rq8^z`^0suGP2EYIS delta 31 ncmZ3+yoFgTEZBpwW$~Rq%4MlV#hLke3Wi1oTwEJD<}m^Qw;c+w diff --git a/examples/runtime/shaders/glsl/vs_cubes.bin b/examples/runtime/shaders/glsl/vs_cubes.bin index d8aa23f142306b7fede3b21c431dd70755e71df8..e226f13c45187e8d2c02eb92c695dd2d6d2133dd 100644 GIT binary patch delta 17 YcmbQq)Xl^Z7VN>er2D<+Mloha05En1RR910 delta 31 mcmeBXn#m*<7VN>er2D<6a#?Coab|v=f}xQC7uQA(W<~&{R0%}@ diff --git a/examples/runtime/shaders/glsl/vs_hdr_blur.bin b/examples/runtime/shaders/glsl/vs_hdr_blur.bin index 9032d136fa70bff247a42798922a557fc33dd6aa..3d6338c50aad47fe7c71264ed53d4ae49aef40e0 100644 GIT binary patch delta 17 Zcmey&`IM6*EZBqb_T%4gHj3S40RTnT2r>Ww delta 31 ncmaFL`I%EJEZBqb_T%4gl*>|!iZk=`6by|FxVScQ++_g()wB#E diff --git a/examples/runtime/shaders/glsl/vs_hdr_bright.bin b/examples/runtime/shaders/glsl/vs_hdr_bright.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_hdr_lum.bin b/examples/runtime/shaders/glsl/vs_hdr_lum.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin b/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_hdr_mesh.bin b/examples/runtime/shaders/glsl/vs_hdr_mesh.bin index b97b554227278052cd2c7831e73846de93ae5219..f1c7bdc2ebb02d0252aa1c5b17431b4f2fd8ccbf 100644 GIT binary patch delta 17 YcmaFOa+if8EZBq5Y^_k&MzK&P05vQHXaE2J delta 31 mcmcc1@|r~~EZBq5Y^_k2a#?Coab|v=f}xQC7uQCPP$mGSiV0W% diff --git a/examples/runtime/shaders/glsl/vs_hdr_skybox.bin b/examples/runtime/shaders/glsl/vs_hdr_skybox.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin b/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin index 38ac17b148311a6545d454320eb40fe5d7e43f79..36c120a0a7663efbc3433ca30c5c97548191cccb 100644 GIT binary patch delta 17 ZcmZqV`pn4@7VN=z`|1PoO3-(}K(*533xh%D)I5R&_!O+Nni)$mtPeuTwTnZ}y diff --git a/examples/runtime/shaders/glsl/vs_mesh.bin b/examples/runtime/shaders/glsl/vs_mesh.bin index d11bbb6d33d9f5756abadfa5940cff7dcce52661..cf336ac465207e83800917a2988156724b5f6f4d 100644 GIT binary patch delta 17 YcmZ3;HJOVeEZBo_>Ri{~8^yR;0Wtmsi~s-t delta 31 mcmbQtwUA3JEZBo_>Ri{~%4MlV#hLke3Wi1oTwEJDxLE`R!1w$hPF0PFnVT=H^ND3|h diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin index 63b36c26d27517aeafadb4c08f1cc0846b61cff0..ef1e42a991cf4310966843d26169fd0d5942e0fc 100644 GIT binary patch delta 17 YcmdnUx|o$CEZBq5Y^_k&MzPsU04|mVJOBUy delta 31 mcmZ3?x{*~ZEZBq5Y^_k2a#?Coab|v=f}xQC7uQCP*-QYKxCtx( diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin index 716e32af2e3b691f12b97f0dd16bbf597593c84e..4f920aeea1e15be94ff6de3094ce5985ebd2483e 100644 GIT binary patch delta 17 XcmaFCbc=~2EZBpQ0SGpV1u+5uD*yxA delta 31 lcmcb`^nyt&EZBpQ0SJ`KQj3Z+^Yau8jSRTBHgW_p0sw{J2g?8e diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin index 541aec895479b5f90070dba5d3eb50aa3df3792b..c08b5667c7d1d8d7b0dbbdd1da2ae9035d1221c2 100644 GIT binary patch delta 16 Wcmcb_c!ZH7EZBpQ0SG3F?EwHJe*^Xa delta 30 kcmX@Yc!^OgEZBpQ0SJ`KQj3Z+^Yau8jSRTBCUWcn0C?*M<^TWy diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin index 197ec792bd42ca62012ef336233594c17d7b68cb..c73da93cabc4dc13c66be714f3319681f1c864cd 100644 GIT binary patch delta 17 YcmeBT`NPZ+7VN>ecl+1ujbdLI0Xpyp7ytkO delta 31 mcmeyv+{Gdm7VN>ecl+0D<+9YG;>`R!1w$hPF0PFnUl;+qNDBx6 diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin index 2fb9ea82048cc53d6c0b895d9de9cb6bc0144169..82cd381305d54b93d1f996a4667fe3a7a4c569b1 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin index 3315c768bc9c38283b82d7b77f143d2f05197f1a..edd0ff75ddfaba91683a069074bf6dfc4d8de679 100644 GIT binary patch delta 17 YcmZo+`^L%<7VN?JGS{qoqu4tp05#zTP5=M^ delta 31 mcmeyy+QKFl7VN?JGS{qIxh%D)I5R&_!O+Nni)$mtJ0<|Da|%8H diff --git a/examples/runtime/shaders/glsl/vs_stencil_color.bin b/examples/runtime/shaders/glsl/vs_stencil_color.bin index 541aec895479b5f90070dba5d3eb50aa3df3792b..c08b5667c7d1d8d7b0dbbdd1da2ae9035d1221c2 100644 GIT binary patch delta 16 Wcmcb_c!ZH7EZBpQ0SG3F?EwHJe*^Xa delta 30 kcmX@Yc!^OgEZBpQ0SJ`KQj3Z+^Yau8jSRTBCUWcn0C?*M<^TWy diff --git a/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin b/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin index 2661e40b27a1f2347cb5c6587df18484d1eb9f1f..e16656f3fde15bf21616ec0d0c3b857d6f1c5111 100644 GIT binary patch delta 17 YcmbQu(#ygT7VNaSEZBpw&i9YcMzIJc06BOD1poj5 delta 31 mcmaFB@{UC;EZBpw&i9Xxa#?Coab|v=f}xQC7uQCP2qplsLJ9Q% diff --git a/examples/runtime/shaders/glsl/vs_tree.bin b/examples/runtime/shaders/glsl/vs_tree.bin index 6d9d196902098129a03fdfea9fb46418a77473f0..4de00d5dd9ca1c942e8718b95be8d17bf49122d7 100644 GIT binary patch delta 17 YcmX@hx}TLJEZBqbWv*HGMzQTo05<~$C;$Ke delta 31 mcmdnbdX`lzEZBqbWv*Gba#?Coab|v=f}xQC7uQCP?Mwiyg$ft| diff --git a/examples/runtime/shaders/glsl/vs_update.bin b/examples/runtime/shaders/glsl/vs_update.bin index 1e175a1ea56bb672f08d29f7351215409858f848..1190296a9b26dcba753eb645d8890c026aed72c4 100644 GIT binary patch delta 17 YcmZ3=G@XefEZBoFU(U{EqZmIU04W3n82|tP delta 31 mcmbQvw3JCKEZBoFU(U`(xh%D)I5R&_!O+Nni)$kXKO+E&@(2k4 diff --git a/src/glimports.h b/src/glimports.h index d9d25ab75..9541af72b 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -15,7 +15,7 @@ // OpenGL 2.1 Reference Pages // http://www.opengl.org/sdk/docs/man/ -#if BX_PLATFORM_WINDOWS +#if BX_PLATFORM_WINDOWS || BGFX_CONFIG_RENDERER_OPENGL >= 31 GL_IMPORT____(false, PFNGLGETERRORPROC, glGetError); GL_IMPORT____(false, PFNGLREADPIXELSPROC, glReadPixels); GL_IMPORT____(false, PFNGLTEXIMAGE2DPROC, glTexImage2D); @@ -100,6 +100,7 @@ GL_IMPORT____(false, PFNGLGENRENDERBUFFERSPROC, glGenRenderbuff GL_IMPORT____(false, PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers); GL_IMPORT____(false, PFNGLRENDERBUFFERSTORAGEPROC, glRenderbufferStorage); GL_IMPORT____(false, PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample); +GL_IMPORT____(false, PFNGLBINDFRAGDATALOCATIONPROC, glBindFragDataLocation); #else GL_IMPORT_EXT(false, PFNGLBINDFRAMEBUFFEREXTPROC, glBindFramebuffer); GL_IMPORT_EXT(false, PFNGLGENFRAMEBUFFERSEXTPROC, glGenFramebuffers); diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index e6a85e8a6..b7b560cd8 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1109,6 +1109,10 @@ namespace bgfx GLint activeAttribs; GLint activeUniforms; +#if BGFX_CONFIG_RENDERER_OPENGL >= 31 + GL_CHECK(glBindFragDataLocation(m_id, 0, "bgfx_FragColor") ); +#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31 + GL_CHECK(glGetProgramiv(m_id, GL_ACTIVE_ATTRIBUTES, &activeAttribs) ); GL_CHECK(glGetProgramiv(m_id, GL_ACTIVE_UNIFORMS, &activeUniforms) ); @@ -1910,6 +1914,31 @@ namespace bgfx } } } +#elif BGFX_CONFIG_RENDERER_OPENGL >= 31 + size_t codeLen = strlen(code); + size_t tempLen = codeLen + 1024; + char* temp = (char*)alloca(tempLen); + bx::StaticMemoryBlockWriter writer(temp, tempLen); + + writeString(&writer, "#version 140\n"); + if (_type == GL_FRAGMENT_SHADER) + { + writeString(&writer, "#define varying in\n"); + writeString(&writer, "#define texture2D texture\n"); + writeString(&writer, "#define texture3D texture\n"); + writeString(&writer, "#define textureCube texture\n"); + writeString(&writer, "out vec4 bgfx_FragColor;\n"); + writeString(&writer, "#define gl_FragColor bgfx_FragColor\n"); + } + else + { + writeString(&writer, "#define attribute in\n"); + writeString(&writer, "#define varying out\n"); + } + + bx::write(&writer, code, codeLen); + bx::write(&writer, '\0'); + code = temp; #endif // BGFX_CONFIG_RENDERER_OPENGLES2 GL_CHECK(glShaderSource(m_id, 1, (const GLchar**)&code, NULL) ); diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 43069670f..928b5fb5c 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -530,7 +530,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, const std::string& _code, bx:: } else { - writef(_writer, "#version %s\n\n", profile); +// writef(_writer, "#version %s\n\n", profile); } bx::write(_writer, optimizedShader, (int32_t)strlen(optimizedShader) ); @@ -1833,7 +1833,7 @@ int main(int _argc, const char* _argv[]) } else { - writef(&writer, "#version %s\n\n", profile); +// writef(&writer, "#version %s\n\n", profile); } } writer.write(preprocessor.m_preprocessed.c_str(), (int32_t)preprocessor.m_preprocessed.size() );