dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
22924 commits 1 branch 39 tags 193 MiB
Commit graph

51 commits

Author SHA1 Message Date
vladislavbelov
992c18aabb Enables ARB shaders only once since we should not mix different backends. 
This was SVN commit r26629.
 2022-03-12 22:10:47 +00:00
vladislavbelov
0456b09c3c Moves shader dependent XML parsing from shader manager to shader program. 
This was SVN commit r26628.
 2022-03-12 22:02:21 +00:00
vladislavbelov
41f2ab87ed Fixes macOS warnings after adding final keyword to simulation classes in 3eee3a444d. 
Also fixes GLES.

Differential Revision: https://code.wildfiregames.com/D4528
This was SVN commit r26605.
 2022-03-07 23:04:11 +00:00
vladislavbelov
647fccd410 Replaces native GL types by backend format in vertex attributes in CShaderProgram. 
This was SVN commit r26594.
 2022-03-07 02:21:05 +00:00
vladislavbelov
db7894ff6b Removes redundant binding slot retrieving from CShaderProgram. 
This was SVN commit r26585.
 2022-03-06 21:17:24 +00:00
vladislavbelov
63f749da2d Removes unused functions from CShaderProgram. 
This was SVN commit r26579.
 2022-03-06 16:40:04 +00:00
vladislavbelov
4de89c3db1 Moves texture management to CDeviceCommandContext, adds quality options. 
Comments By: nwtour, Stan
Tested By: nwtour, Stan
Differential Revision: https://code.wildfiregames.com/D4488
This was SVN commit r26365.
 2022-02-13 19:30:28 +00:00
vladislavbelov
912202ff0c Uses core GL functions for GLSL shaders. 
Tested By: nwtour, Stan
Differential Revision: https://code.wildfiregames.com/D4416
This was SVN commit r26175.
 2022-01-06 11:41:04 +00:00
Stan
0a8d382657 Fix OpenGL ES 2.0 Warnings. 
This was SVN commit r26167.
 2022-01-04 20:54:37 +00:00
vladislavbelov
abc3190c03 Removes binding native GLuint textures from public ShaderProgram API. 
Differential Revision: https://code.wildfiregames.com/D4407
This was SVN commit r26143.
 2021-12-30 16:37:51 +00:00
vladislavbelov
92cf0c784c Removes Handle from ShaderProgram to use more high-level objects. 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4403
This was SVN commit r26138.
 2021-12-29 07:07:08 +00:00
Stan
c9bea80e0d Use GLAD2 a multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator. 
Comments by: @nwtour, @Langbart, @bb
Based on patch by: @echotangoecho
Tested on Windows 7 & 10, Ubuntu and macos.

Differential Revision: https://code.wildfiregames.com/D721
This was SVN commit r26093.
 2021-12-21 22:03:31 +00:00
wraitii
6d10a35d97 Fix some warnings. 
- 25332f9b86 added 'override' to a method in ShaderProgram.cpp. This
adds it to the rest.
- BinarySerializer.cpp had custom JS includes, because putting those in
ScriptExtraHeaders failed. The cause is that gloox leaves "#define
lookup" up. This has been reported upstream, and fixed here.
- VS17 complains about an uninitialised variable, though the usage is
safe.

Differential Revision: https://code.wildfiregames.com/D3916
This was SVN commit r25359.
 2021-05-02 15:45:40 +00:00
vladislavbelov
a564892fab Removes redundant normalizations for float types. 
Tested By: Langbart
Differential Revision: https://code.wildfiregames.com/D3517
This was SVN commit r24833.
 2021-02-04 20:03:03 +00:00
vladislavbelov
02f2be9272 Adds logging of a shader name on an error after reload. 
Differential Revision: https://code.wildfiregames.com/D3462
This was SVN commit r24814.
 2021-02-01 13:50:07 +00:00
vladislavbelov
ae18a5474c Reduces shadow biases for landscape shaders. 
Tested By: Stan, wraitii
Differential Revision: https://code.wildfiregames.com/D3457
This was SVN commit r24777.
 2021-01-23 19:40:58 +00:00
vladislavbelov
7c3e885cef Implements binding a float array as a uniform input. 
This was SVN commit r24711.
 2021-01-19 19:57:31 +00:00
vladislavbelov
6f3b4b31fd Removes GLSL shaders code duplication for fog and shadows 
Comments By: Stan
Differential Revision: https://code.wildfiregames.com/D3340
This was SVN commit r24598.
 2021-01-13 20:44:27 +00:00
vladislavbelov
25332f9b86 Adds #include directive support to shaders 
Comments By: Stan, wraitii
Tested By: Freagarach, Stan
Differential Revision: https://code.wildfiregames.com/D3030
This was SVN commit r24553.
 2021-01-11 23:23:30 +00:00
wraitii
369c2e8801 Further header & precompiled cleanup, fix no-PCH builds. 
GUIObjectBase is made a IGUIObject* to avoid including those headers
un-necessarily. Subsequent diffs ought to clean up the various of
pointers for that with a similar type with reference semantics.

Also:
- Add standard C and C++ headers (mostly cstring for memcpy, string and
vector) where needed.
- Swap out some includes for forward declarations
- Clean up un-necessary boost includes in precompiled and other headers.
- Clean up precompiled headers, including fewer things.
- Move ACPI to the windows-specific folder as it's included there only
and mostly specific to that platform.

Thanks Stan for the testing.

Differential Revision: https://code.wildfiregames.com/D3129
This was SVN commit r24352.
 2020-12-09 14:39:14 +00:00
Stan
aef0c3c13a Move Ogre3D GLSL Preprocessor to a third_party folder and restore its original name. Also restore the Wrapper name to reflect what it's wrapping and move it to renderer. 
Reviewed by: @Angen
Comments by: @elexis
Differential Revision: https://code.wildfiregames.com/D2338
This was SVN commit r23215.
 2019-12-07 11:48:03 +00:00
vladislavbelov
651cf8b364 Split CColor from Shapes. 
Reviewed By: wraitii
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D1515
This was SVN commit r22051.
 2019-01-13 15:38:41 +00:00
elexis
09e974e1cb Bump year number of files changed this year in the license headers. 
This was SVN commit r19503.
 2017-05-01 14:28:22 +00:00
Imarok
ee987d3b0d Add some consts to ShaderProgram functions 
Reviewed by: vladislavbelov
Differential Revision: https://code.wildfiregames.com/D315
This was SVN commit r19403.
 2017-04-10 15:44:33 +00:00
elexis
417c84870c Actually remove trailing tabs from source/. 
This was SVN commit r18991.
 2016-11-23 14:09:58 +00:00
Itms
caf89fa04e Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h. 
The file name did not match the content.

Also little cleanup of some unnecessary includes.

This was SVN commit r16431.
 2015-03-15 18:06:32 +00:00
Ykkrosh
2e01b157d6 Fix build error in GLES configurations 
This was SVN commit r16207.
 2015-01-23 20:54:14 +00:00
Ykkrosh
e02d7ad949 Automatically replace %hs/%ls with %s in CLogger format strings. 
Everything is char* now, so we don't need to mess around with different
string types.

Done with:

  ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs perl
-pi -e'1 while
s/(LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR).*)%[hl]s/$1%s/g'

This was SVN commit r16187.
 2015-01-22 20:36:24 +00:00
Ykkrosh
38a8e2e0d6 Automatically convert most path.string().c_str() to path.string8() 
Done with:

  ag -l 'LOG.*string\(\).c_str\(\)' source | xargs perl -pi -e'1 while
s/(LOG.*string)\(\)\.c_str\(\)/${1}8()/g'

This was SVN commit r16186.
 2015-01-22 20:35:17 +00:00
Ykkrosh
49e2ecea63 Automatically convert all CLogger format strings from wchar_t* to char*. 
Done with:

  ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs sed
-i 's/LOG\(MESSAGE\|MESSAGERENDER\|WARNING\|ERROR\)(L/LOG\1(/g'

This was SVN commit r16183.
 2015-01-22 20:31:30 +00:00
historic_bruno
5771bee032 First pass at fixing GLES build - more to come 
This was SVN commit r14149.
 2013-11-12 01:17:16 +00:00
Ykkrosh
994ebd9836 Add a list of statically-constructed CStrIntern strings 
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.

This was SVN commit r13906.
 2013-09-29 13:19:52 +00:00
myconid
9e328e6b9f Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory. 
This was SVN commit r12727.
 2012-10-03 12:40:01 +00:00
Ykkrosh
0bd649294f Add support for texture-based terrain overlays. 
Fix GLES compatibility.

This was SVN commit r11663.
 2012-04-24 16:46:32 +00:00
Ykkrosh
ce215cace3 Add support for custom vertex attributes and array-of-matrix uniforms in GLSL. 
This was SVN commit r11489.
 2012-04-12 14:10:02 +00:00
Ykkrosh
f2260892bd Add config option to force alpha-tested materials. 
This was SVN commit r11475.
 2012-04-10 21:03:22 +00:00
Ykkrosh
b7888aea52 Add support for specular materials. 
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.

This was SVN commit r11453.
 2012-04-08 15:55:06 +00:00
Ykkrosh
6bc33fe8bd Update renderer design to be more flexible and data-driven based on material and shader definitions. 
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.

This was SVN commit r11423.
 2012-04-03 18:44:46 +00:00
Ykkrosh
9b0a3830df Support more commands in shader technique XML files. 
Always print GLSL shader logs, to help debugging.

This was SVN commit r11149.
 2012-02-25 15:38:38 +00:00
Ykkrosh
5f6e3de42f Convert shaders to GLSL ES automatically 
This was SVN commit r11079.
 2012-02-15 20:33:43 +00:00
Ykkrosh
d89c82092a Fix GLSL shaders on Mesa 
This was SVN commit r11063.
 2012-02-13 20:47:14 +00:00
Ykkrosh
677ccf53e6 Yet more GLES compatibility 
This was SVN commit r11061.
 2012-02-13 16:41:17 +00:00
Ykkrosh
4bf59b9a7d More GLES compatibility, mainly around terrain rendering. 
This was SVN commit r11059.
 2012-02-13 14:02:14 +00:00
Ykkrosh
db85833655 More GLES compatibility. 
Move more rendering code to shader API.

This was SVN commit r11050.
 2012-02-12 13:20:49 +00:00
Ykkrosh
a3f168b887 Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility. 
Specify GLSL version in shader files, for better error detection.

This was SVN commit r11040.
 2012-02-09 17:55:25 +00:00
Ykkrosh
cc5a0fba4e Use shader API for GUI text. 
Flip GUI quads so we don't have to disable back-face culling.

This was SVN commit r10989.
 2012-01-30 00:27:23 +00:00
Ykkrosh
9884d21830 Be more consistent in using the ARB forms of functions. Fixes #1138, based on patch by Echelon9. 
This was SVN commit r10983.
 2012-01-29 12:15:22 +00:00
Ykkrosh
8324a8981d Simplify GLSL program files. 
Move water shaders to new shader system.

This was SVN commit r10982.
 2012-01-29 12:04:39 +00:00
Ykkrosh
adbd7633dd # Initial GLSL rendering support 
This was SVN commit r10978.
 2012-01-29 01:22:22 +00:00
Ykkrosh
8729d1115d Render territory borders in non-shader render path. 
Add basic support for fixed-function implementations of shader API.

This was SVN commit r10106.
 2011-08-27 14:31:24 +00:00