kaetemi
|
984b899287
|
GL3: Set slowUnlockVertexBufferHard to false
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f3766f9c40
|
GL3: Implement RAMPreferred
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
fef2365b5d
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
766cace955
|
Implement volatile vertex buffer for opengl driver, should provide considerable performance improvements for particle systems. Needs additional testing.
|
11 years ago |
kaetemi
|
f799bdb650
|
GL3: Optimize volatile vertex buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
516a56acd8
|
GL3: Use GL_STREAM_DRAW for volatile buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b6ac857074
|
GL3: Refactor vertex buffers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
46ac4541f9
|
GL3: Rename
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9b48fb0c5a
|
Change default for 'setStaticMemoryToVRAM'
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
457f794584
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
db5c65fedf
|
Merge
|
11 years ago |
kaetemi
|
1a4a7bafab
|
Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea
|
11 years ago |
kervala
|
e84dd7b5f7
|
Changed: Replaced strlwr by toLower
|
11 years ago |
kervala
|
24fa8df5ff
|
Fusion avec default
--HG--
branch : compatibility
|
11 years ago |
kervala
|
3fff8fe467
|
Changed: Replaced strlwr by toLower
--HG--
branch : compatibility
|
11 years ago |
Nimetu
|
7cc1bf9f17
|
Fix compiling on linux with new OpenGL headers (issue #145)
--HG--
branch : Issue#145
|
11 years ago |
dfighter1985
|
4abf74d6e9
|
We can now drag elements, they will disappear and whatnot, but at least they can be dragged!
--HG--
branch : gui-editor
|
11 years ago |
dfighter1985
|
e12d189d51
|
Refactored input event handling a bit.
--HG--
branch : gui-editor
|
11 years ago |
dfighter1985
|
41f44b2aa6
|
Merge default.
--HG--
branch : gsoc2012-gui-editor
|
11 years ago |
kervala
|
ed1a84c99b
|
Changed: Updated OpenGL and OpenGL ES headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
831758beb1
|
Fixed: nglXSwapIntervalEXT return type should be void
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
a0796d23de
|
GL3: Don't use expensive dynamic_cast
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
96d4a17340
|
GL3: Render up to 31 lightmaps at once!
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5d542ed91e
|
GL3: Increase number of usable samplers in program from 4 to 32
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
393d08532a
|
GL3: Alpha test bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cda664c62a
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
181db9adb9
|
GL3: Initial lightmap shader implementation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9df1935f5e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a37d7a3127
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9dbdcd1d4e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b372f203ec
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cb3f3b72c5
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
07f663a68e
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5a4dd538f1
|
GL3: Implement mapTextureStageToUV
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
09db5b352c
|
GL3: Bugfix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
007d8877b8
|
GL3: Remove invalid calls
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f347172bbe
|
GL3: Use compatibility instead of core, because core disables s3tc extension...
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
44102b2034
|
GL3: Use glClearBuffer
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7e565518ec
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
07269aea3e
|
Backed out changeset: 455175ba6c2e
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
ec190696ad
|
GL3: Unlit material color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4913e7dc94
|
GL3: Primary and secondary color vertex attributes
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4b4ac31a3d
|
Remove branch unrelated features (must backout this changeset after merging into parent feature branch)
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
267e7397c5
|
GL3: Support specular materials with missing textures
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
cfe1b2b8da
|
GL3: Don't call virtual getters for accessing internal data, please
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
6d946081e3
|
GL3: Fix typo
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
25cb297dcf
|
GL3: Fix for texture formats
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d415ff508e
|
Backed out changeset: 96647f9b388a
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
725ec35188
|
GL3: Use core profile texture formats
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d421f34c1a
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9cf5b3305c
|
GL3: Create 3.3 core profile context
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
11e871c8ab
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a17fc28955
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f7d0b292f7
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
75d2bf91bf
|
GL3: Even more refactoring
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
17b3fa7b55
|
GL3: More refactoring
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5002eea62a
|
GL3: Further refactor
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
a13d39e9f4
|
GL3: Begin refactoring pixel program
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5ed5cd5ea8
|
Add interface for HMD with player death support
|
11 years ago |
kaetemi
|
270342a07d
|
GL3: Specular related
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
2aa36f413d
|
GL3: Prepare TexGen implementation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
8532f79833
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
62381dd219
|
GL3: Cleanup dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
1a40e67fee
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
11dc9110c2
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
c0bb40b4a5
|
GL3: Fix tex coord (fixes landscape near rendering)
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
c270ec5a58
|
GL3: Remove dead code
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
12cb0ac306
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
78ec40afa7
|
GL3: Rewrite generateTexEnv
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
f62228592e
|
GL3: Cleanup samplers
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7691e22a28
|
GL3: Fix ambient
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
75e650432f
|
GL3: Cleanup and fix lighting state bug in pp
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d5d82ce900
|
GL3: Fix
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
443eb54128
|
GL3: Note
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
21eca5af5f
|
GL3: Optimize
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
424aa079a2
|
GL3: Cleanup
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b25747b2ef
|
GL3: Optimize VP switching
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5d80073c0f
|
GL3: Refactoring vertex program generation
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7a960ed768
|
GL3: Cleanup user program state
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3885389b3b
|
GL3: Remove GL_LIGHTING
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
641125963e
|
GL3: Replace glActiveTexture
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
7ae15eb2b8
|
GL3: Remove ARB_multitexture
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
89c83f86e5
|
GL3: Remove GL_EXT_blend_color and GL_EXT_secondary_color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
4fe91132ce
|
GL3: Remove GL_ARB_multisample
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
5ad62b942a
|
GL3: Remove GL_MAX_TEXTURE_UNITS_ARB
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
9c1165dcf9
|
GL3: Remove GL_MAX_LIGHTS
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
8a60e5d4fa
|
GL3: Remove checkForPerPixelLightingSupport
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
313de47e53
|
GL3: Remove GL_ARB_texture_rectangle
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
0802330985
|
GL3: Remove GL_ARB_texture_cube_map
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
441d3a66f5
|
GL3: Remove GL_EXT_separate_specular_color
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
fce7aab22c
|
GL3: Remove GL_EXT_vertex_weighting
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d7c5d30523
|
GL3: Remove GL_ARB_texture_non_power_of_two
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
79141e0a9c
|
GL3: Remove GL_ARB_texture_compression
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3c1b39e103
|
GL3: Remove unused variable
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3bba0fad6c
|
GL3: Remove GL_EXT_framebuffer_object
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
40a6972753
|
GL3: Remove GL_ATI_texture_env_combine3 and GL_ATIX_texture_env_route
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
118d6e0966
|
GL3: Remove GL_NV_occlusion_query
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
2139f39c43
|
GL3: Remove GL_EXT_texture_env_combine
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b978ec5c8e
|
Cleanup extensions
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
b12c15ab5d
|
Follow existing code style
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
99f37eb90c
|
Cleanup style
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
be050f3927
|
Cleanup
--HG--
branch : opengl3
|
11 years ago |
kervala
|
8f6c32bd69
|
Backed out changeset: 3937923211ec
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
e01a42e21f
|
Fix shader compile
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
082504bc70
|
Workaround for shader bug
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
444d652435
|
More logging
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
41f77780d5
|
Functions texture2D and textureCube are deprecated
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
870df89bcd
|
Remove unnecessary assert
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
df1e27b82c
|
Fix shader compile on nv driver
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
d7a0816547
|
Merge with default
--HG--
branch : opengl3
|
11 years ago |
kaetemi
|
3738aa71ce
|
Fix EOL
--HG--
branch : opengl3
|
11 years ago |
kervala
|
c83afd649d
|
Changed: Replaced some Mac OS X warnings by TODO comments
--HG--
branch : compatibility
|
11 years ago |
kervala
|
81881a583f
|
Fixed: Switch not handled warnings
--HG--
branch : compatibility
|
11 years ago |
kervala
|
bfaf952f32
|
Fixed: Warnings with clang: wrong ! and == operators order
|
11 years ago |
kervala
|
8fa24eeb4e
|
Fixed: Warnings with clang: wrong ! and == operators order
--HG--
branch : compatibility
|
11 years ago |
kervala
|
a0801ebffe
|
Changed: Removed useless definitions
|
11 years ago |
kervala
|
7ab7952dbd
|
Changed: Removed useless definitions
--HG--
branch : compatibility
|
11 years ago |
kervala
|
def5243d06
|
Changed: Updated OpenGL headers
|
11 years ago |
kervala
|
ee87716aa0
|
Changed: Updated OpenGL headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
a77bddf265
|
Changed: Give priority to ARB extensions in tests
--HG--
branch : compatibility
|
11 years ago |
kervala
|
55a29115ba
|
Changed: Detect available video memory with OpenGL extensions
|
11 years ago |
kervala
|
d4fb36d1eb
|
Changed: Detect available video memory with OpenGL extensions
--HG--
branch : compatibility
|
11 years ago |
kervala
|
0aaad7051b
|
Changed: Use OpenGL ES functions prototypes from official headers
|
11 years ago |
kervala
|
3e30929867
|
Changed: Use OpenGL ES functions prototypes from official headers
--HG--
branch : compatibility
|
11 years ago |
kervala
|
c59f9d8a5e
|
Changed: Optimize OpenGL driver PCH
|
11 years ago |
kervala
|
406df1c59c
|
Changed: Optimize OpenGL driver PCH
--HG--
branch : compatibility
|
11 years ago |
kervala
|
927ff14998
|
Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
|
11 years ago |
kervala
|
713c07e1e6
|
Changed: Use OpenGL functions prototypes from official headers
Fixed: glDeleteObjectBufferATI replaced by glFreeObjectBufferATI since 2002
--HG--
branch : compatibility
|
11 years ago |
kervala
|
2076a6b13d
|
Changed: Typo
|
11 years ago |
kaetemi
|
de9724a821
|
Add color to console output
|
11 years ago |
dfighter1985
|
2ca40f10eb
|
Merging default.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
681a0bc8f3
|
Don't generate and cache shaders if they are set up from outside of the driver.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
43ad0189c6
|
Set up the shader programs in setupMaterial call.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
709c54e485
|
Fixed a GLSL syntax bug that I introduced into the shader generator in December. Specular material will now longer disappear.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kaetemi
|
76ce7523ff
|
Additional streaming behaviour fix for XAudio2 driver
|
11 years ago |
kaetemi
|
49fa568123
|
Remove some debug
|
11 years ago |
kaetemi
|
d680b70308
|
Fix some streaming behaviour in XAudio2 driver
|
11 years ago |
kaetemi
|
6426393210
|
Additional streaming behaviour fix for XAudio2 driver
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
f703359eaa
|
Remove some debug
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
17b99ba796
|
Fix some streaming behaviour in XAudio2 driver
--HG--
branch : compatibility
|
11 years ago |
kervala
|
c26e4c7426
|
Changed: Typo
--HG--
branch : compatibility
|
11 years ago |
botanic
|
2e1b47e3f0
|
Backed out merge changeset: b2d97621fa3b
Backed out merge revision to its first parent (99840e8413f2)
|
11 years ago |
kervala
|
6b04b77bdd
|
Fixed: Reverted i18n change
--HG--
branch : compatibility
|
11 years ago |
kaetemi
|
ccf99f4f8e
|
Merge
|
11 years ago |
kaetemi
|
4f2a1b7db2
|
Fix the bug that caused the shape exporter to crash
|
11 years ago |
Matthew Lagoe
|
3f04907c31
|
Merged in botanic/ryzomcore-botanic-testing (pull request #21)
Make it so that bad text always throws a nlwarning
|
11 years ago |
botanic
|
e728daa7cd
|
Add CMAKE option and NVIDIA PerfHUD support
|
11 years ago |
kaetemi
|
40fe633dbe
|
Fix thread lockup in zone lighter
--HG--
branch : build_pipeline_py
|
11 years ago |
kaetemi
|
89a2a2ce99
|
Do not select stereo display debugger when HMD is set to Auto in Snowballs
|
11 years ago |
kaetemi
|
bcb2f48940
|
Remove georges4cvs feature
|
11 years ago |
botanic
|
e995784886
|
Fixed typo issue 60
|
11 years ago |
botanic
|
71b0f9ae92
|
Issue #60
does seem to work better when latency is high
|
11 years ago |
botanic
|
60495f79ac
|
Merge
|
11 years ago |
botanic
|
b6441edf2d
|
Fix for Issue #94
|
11 years ago |
kervala
|
a5a9532a13
|
Changed: Best fix for Freetype new layout (we only just need to include ft2build.h as done in font_generator.h)
|
11 years ago |
kervala
|
09e3471f1b
|
Fixed: Compilation with freetype
|
11 years ago |
Nimetu
|
ea5a36b105
|
Remove tooltip debug message from logs
--HG--
branch : misc-patches
|
11 years ago |
Nimetu
|
3cd6ecdb82
|
Add deadlock counter to prevent endless loop (issue #73)
--HG--
branch : misc-patches
|
11 years ago |
dfighter1985
|
3a84270a84
|
Textures with DSDT/DUDV format will now be uploaded as RG8. Ryzom will now not crash while entering world.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
fb38a7a0a7
|
Disable lights when the material isn't lighted.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
2a158e76e1
|
Lights should now be turned off even when enableLightInternal is called directly. This also fixes the dark background on the character selection screen.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9c69e1bf84
|
Material colors ( ambient, diffuse, specular ) should now be used when there's no texture available.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
kervala
|
b96ad682f5
|
Fixed: Compilation under Mac OS X
|
11 years ago |
kervala
|
a45bbd96c5
|
Fixed: Warning with clang
|
11 years ago |
kervala
|
af1721a0a4
|
Changed: Don't need to change _PolygonSmooth if value is the same
|
11 years ago |
kervala
|
166607f644
|
Changed: Implement VSync under Mac OS X
|
11 years ago |
kervala
|
73196fe7fe
|
Changed: Replace strlwr by toLower
|
11 years ago |
kervala
|
b46c316940
|
Fixed: #77 crash when using lua:parseInterfaceFromString() (a big thanks to nimetu for the fix !)
|
11 years ago |
kervala
|
d8a6c9f966
|
Fixed: Warning with clang
|
11 years ago |
kervala
|
36a537a88e
|
Changed: Replaced atof by fromString
|
11 years ago |
kervala
|
b7082644f0
|
Changed: Updated OpenGL registry
|
11 years ago |
dfighter1985
|
a119d3e1a0
|
Use the view matrix instead of modelview to transform the light stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
8f2e75415c
|
Set up the normalmatrix in the driver and feed it to the shaders, instead of calculating it in the shaders.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
9c0e1c2449
|
Tattos ( and other multitextured stuff ) will now show up again, even if there's only one texture coordinate set.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
7f7a3e159b
|
Reverse directional light direction as it is done in the old OpenGL driver. Also normalize normal.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
90dc025fd8
|
Fixed: Some uniforms names were wrong after the merge, which led to rendering issues.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
eb9b3e4f0f
|
Implemented light controls.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
Botanic
|
6dfafa7ae1
|
Merge
|
11 years ago |
dfighter1985
|
1cc71457eb
|
Implemented a basic fog control widget.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
sfb
|
df7110d2d6
|
Bad merge resolution, fixed a couple source files which merged poorly.
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Botanic
|
7381de073e
|
fixed bad merge
|
11 years ago |
Botanic
|
057fe3e0f7
|
Merge
|
11 years ago |
dfighter1985
|
ed885d3df6
|
Replaced ARB VertexAttribArray stuff with the core calls.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
d37b004372
|
Removed some more deprecated stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
a9a9768872
|
Removed ARB fragment shader stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
f768704cbf
|
Removed some ATI stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
6947a58ba1
|
Removed fixed embm stuff.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
8276cb0140
|
We shouldn't set up a generated or newly compiled shader program if we already have one ( set up from outside the driver for example ).
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
dfighter1985
|
82a7237e7d
|
Forgot to actually add the driver infos to the list, which caused the driver to hang on deletion.
--HG--
branch : gsoc2013-dfighter
|
11 years ago |
sfb
|
892ed1ed3d
|
merge from default
--HG--
branch : gsoc2011-worldeditorqt
|
11 years ago |
Matt Raykowski
|
0001719d99
|
Merged in DJanssens/quitta-ryzomcore (pull request #25)
Ryzom AMS - GSOC Project
|
11 years ago |
dfighter1985
|
982b99d8d0
|
Merged the GPU program stuff from mainline.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
563afd027c
|
Fix #67 bad NELID in vertex program parser
|
12 years ago |
dfighter1985
|
3b16f096cc
|
Merge with rename commit.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
32e814ecb6
|
Use separate shaders in the OpenGL3 driver.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kervala
|
eb3c58cce9
|
Fixed: Use multiarch library path under Linux
|
12 years ago |
kervala
|
de43ea8d86
|
Fixed: Some warnings
|
12 years ago |
kervala
|
f2ee0e99d8
|
Changed: Detect Windows 8 and Windows Server 2012
|
12 years ago |
kervala
|
43bbfe3da7
|
Fixed: Some warnings
|
12 years ago |
kaetemi
|
3b4730c890
|
Fix warnings
|
12 years ago |
dfighter1985
|
b70ce1eb09
|
Renamed OpenGL3 to opengl3
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
ace1b5386b
|
Check GL_ARB_separate_shader_objects extension on startup, and load related functions.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
cf6d2a88bc
|
Removed some now unused methods.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
afb56ea660
|
Moved the rendering methods into a new file.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b0613e334c
|
Removed a now unused file.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9d3e3a6a73
|
GL_VERTEX_PROGRAM_TWO_SIDED_ARB isn't used in the GL3 driver.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
7b5aaf7e0f
|
Some cleanup, most of the old OpenGL stuff should be gone.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
5326324b56
|
Some comments.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
69a4a9f9a5
|
Two sided rendering, while using dynmat.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
dbd5185de1
|
Only use the shader combo box for the user shaders.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
586c25f864
|
When clearing the dynmat, should clear all of them. Also fixes a crash.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
3949c210f6
|
OpenGL should be fed a clamped color value.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b775237215
|
It's now possible to render using the user shaders and dynmat.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Quitta
|
a484de5b3f
|
Merge with quitta-gsoc-2013
|
12 years ago |
kervala
|
bb7297f260
|
Fixed: Wrong variable used to compute array length
|
12 years ago |
kervala
|
b7ddc2c0d2
|
Fixed: OpenGL ES driver compilation
|
12 years ago |
kervala
|
82904232d2
|
Fixed: Warnings with GCC
|
12 years ago |
kervala
|
6695a9064e
|
Changed: Created NELID macro to fix warning "multi-character character constant"
|
12 years ago |
dfighter1985
|
8269ec7be5
|
Wrong direction, wrong lighting!
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
11fe86e552
|
Forgot to actually pass the direction in the previous commit...
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
72e7d09113
|
Don't calculate these more than once.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
69c41a31ae
|
These positions and directions were supposed to be in eye coords.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0453f30582
|
Added lighting to the specular shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
f194704a28
|
Refactored directional lighting a little. No need to calculate things more than once.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0ab68ef25f
|
Added point light support.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9a647a893c
|
Specular shader should compile even when there's no fog added.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c6bb6ec2a9
|
Renamed a bunch of shader related classes in NL3D to contain the word Usr, since they are user shader related.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6c58856ed7
|
Shininess is now loaded from the material as a uniform instead of being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
4ba9d815d4
|
Colors are now set from the light setup, rather than being hardcoded.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6f396aa8f7
|
Added the directional light(s) to the lightmap shader too.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
01ef7fd973
|
The specular calculation is probably faster this way.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
4ec92d2f06
|
Simplified the directional light shader generator functions.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
28c4b5b157
|
Added specular term to the directional lights.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
354d2b8c65
|
Added ambient term support for directional light.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
43817746ec
|
Renamed light[n]Col to light[n]ColDiff.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0def5caf54
|
Added diffuse directional light support to the normal shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
3c99323ada
|
Apparently typos and redundantly setting uniforms can totally ruin rendering :D
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
5fbfe7b17f
|
Since now we have fog support, this doesn't need to be disabled anymore.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
1a669307da
|
Fix typo
|
12 years ago |
kaetemi
|
ce9e0a397b
|
Fix regression from stereo branch in wind tree
|
12 years ago |
kaetemi
|
046e3c92da
|
Fix compile error in vertex program
|
12 years ago |
kaetemi
|
3c099397d8
|
Update supportVertexProgram calls
|
12 years ago |
kaetemi
|
256f7ff06c
|
Cleanup unused code
|
12 years ago |
dfighter1985
|
8d57eac3d4
|
Some basic fog.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
6dfc8d0a00
|
Rename
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
973215e1d0
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
96dc139ddd
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
df123d6b89
|
Fix compile errors caused by missing includes
|
12 years ago |
kaetemi
|
d2bc32e598
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
cd9baf8f89
|
Cleanup
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
74cff50842
|
Use named indices with wind tree program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
c766940e75
|
Use named indices for per pixel light vertex program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
f9c9c1836a
|
Use named uniform indices for lighted vertex program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
61af565bf9
|
Updated wind tree program container
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
c353121771
|
Use lighted vertex program container for per pixel light program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
a72f25e763
|
Add container for lighted vertex program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
ab231ea700
|
Adjust order for meshvp
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
278e19743c
|
Do not use old interface here
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
d5c2a0527d
|
Modify calls in bloom effect
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
5e14dc4458
|
Update veget implementation
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
9d93ae51a3
|
Fixes for d3d
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
c6b714299a
|
Instead of their own bool, store enabled features in the features variable as a flag.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
bbb4762b77
|
Move shader description generation to it's own method.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
06d7bd9c74
|
Added alpha test to generated shaders.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
d6558b5b0d
|
Fixed some typos with shader generation.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
21a70b4211
|
Update d3d implementation and add some debugging code
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
300cd284d1
|
Generate samplers for Lightmap shader, based on the number of lightmaps. This fixes the weird display of some lightmapped shapes.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
e8d77e23e0
|
Rename of a d3d specific class
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
c6139419ac
|
Partial update of veget vp
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
5fbb220795
|
Update some test code
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
c53aa6958e
|
Small adjustment to landscape vp parameter setting
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
88cbc2f82b
|
Simplify
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
abafc9b1ef
|
Adjust landscape vertex program to use new interface
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
36a30e83a0
|
Don't try to render if can't set program up.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
1acccdb5ef
|
Uniform index caching.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
5ad617efb6
|
Use new program interface for water vertex program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
32809d646a
|
Set driver parameters
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
64643e564b
|
Some fixes
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
0429e67903
|
Use CSmartPtr for vertex program
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
8f4fe87b7b
|
Set params from storage
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
e3dead19e4
|
Replace temporary CMaterial code
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
e9444ce36a
|
Implement param storage copy
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
bb625c33bd
|
Flag some TODO's
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
87b24bc4ab
|
Add glsl pixel program for stereo distortion
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
16290f7ff9
|
Merging default.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
ac2e087fbf
|
Cleanup abstract gpu program interface
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
0d743d7f37
|
Implement new driver interface in Direct3D driver
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
81876009d3
|
Implement new driver interface in OpenGL driver
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
d1b93ac3d6
|
Expand parameter interface
--HG--
branch : multipass-stereo
|
12 years ago |
dfighter1985
|
882118612d
|
Moved some constants to uniforms.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
77ae38e452
|
Added a very primitive shader caching scheme.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
kaetemi
|
e84e08b0f6
|
Reduce function duplication
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
afe6c16bf3
|
Separate count and size
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
05583d134a
|
Cleanup driver interface
--HG--
branch : multipass-stereo
|
12 years ago |
kervala
|
0ccec811d6
|
Changed: Updated Freetype libraries variable
|
12 years ago |
kervala
|
87ee7fa8d2
|
Changed: Moved lua, luabind and curl FIND_PACKAGE in root CMakeLists.txt
|
12 years ago |
kaetemi
|
235bfcfd94
|
Add additional set functions
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
f0af3326e6
|
Add gpu program params storage structure
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
ee0396bd6f
|
Implement new gpu program interface in direct3d driver
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
350b580085
|
Implement new gpu program interface in opengl driver
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
1fa02cae9e
|
Make gpu programs use abstract gpu program class
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
97c9c26690
|
Add abstract gpu program and source classes
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
361b7eab74
|
Fix compile error
|
12 years ago |
kervala
|
89b945bb8c
|
Changed: Minor changes
|
12 years ago |
kervala
|
d03c795dd8
|
Changed: Don't use NLMISC includes in NLMISC PCH
|
12 years ago |
dfighter1985
|
931c18cb51
|
Diffuse texenv should work with the material color, not the diffuse color. Also modulate the texenv result with vertex color if applicable. Also add the shader type as comment in the top of the shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
34de0b5569
|
Removed renderTriangles2 as the normal render loop is used now.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
a1cf2c640b
|
This too.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
35429fea43
|
Oups forgot this when changing the rendering loop.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
eabc209303
|
Render from the normal loops.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
888812e72d
|
Only validate the shader program after it's set up. Avoids false alarm.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
5bc7ecf799
|
Specular shader is now on GLSL.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
86482ed82f
|
Fixed some shader compile errors.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
ed23ec247d
|
Render lightmaps with GLSL.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0ab6322955
|
More fixed functionality pipeline disabled with conditional build.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
997a231bff
|
Conditionally build some deprecated functions. Also little adjustment to the shader texenv generator.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c74e279282
|
Some settings for the normal shaded material.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
e740fd4aeb
|
Don't crash when releasing.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
d67640dab6
|
Render with GLSL. Long way to go.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
169ee413df
|
Redundant cloud shader code.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
f77bcf6981
|
Generate cloud shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
2c84b164ee
|
Water shader generation.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
Thibaut Girka
|
ea8a845ab9
|
Add support for LibVR
--HG--
branch : multipass-stereo
|
12 years ago |
kaetemi
|
7782576dfc
|
Merge with default
--HG--
branch : multipass-stereo
|
12 years ago |
kervala
|
6d10e3189c
|
Changed: Formatting
|
12 years ago |
kervala
|
881912fa34
|
Fixed: Crash when trying to display a missing texture
|
12 years ago |
dfighter1985
|
750e7b5e8e
|
A little explanation after I successfully decyphered this.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
d64dd4f23f
|
Generate shader for per-pixel without specular.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
6b3b8855ee
|
Generate Per-Pixel Lighting shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
2ca79259ce
|
More work on specular shader generation. Hopefully now it's right.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
1414f4d3c1
|
Little bit of refactoring.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
12df2fd71c
|
Generate specular shader.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
69cc5e48ed
|
Lightmap shader generator.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
f6737c8aa4
|
UserColor shader should use the normal generator.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
4f8ac17529
|
Implemented the mapping of TexEnv calls to GLSL. More or less.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c49265b9db
|
The stringstream used is now part of the generator class.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
7384cdd10a
|
Added offset enum.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
0dcb470a19
|
Generate the pixel shader ins too.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
46363f1909
|
Started working on the shader generator.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
d67198580a
|
Implemented uniform querying, setting. Also updated the test triangle.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
9dc91a6ed1
|
Abstract program objects, vertex, and pixel programs can now be created using the driver, so the user can now feed shaders to it.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
41e84066fb
|
Better store vertex and pixel programs separately so we can detach them if needed.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
f5358f712c
|
Rendering the debug triangle with GLSL now works.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
b3ea9ee787
|
Implemented shader and program object classes.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
ed5741addd
|
Added stubs for GLSL program classes.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
c7e8ebcf05
|
Added some more GLSL related calls.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
50bb8c5d60
|
Made some GLSL related OpenGL functions available.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
10aad932db
|
Removed checks for ARB fragment shader, as it's part of OpenGL as of 3.0+, also fragment shaders cannot be disabled as of the same version.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
dd0a691fb8
|
This also belongs there.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |
dfighter1985
|
90595b5bb6
|
Removed NV Texture env combine stuff.
--HG--
branch : gsoc2013-dfighter
|
12 years ago |