Here is the nightly for Linux on 04 Jan 2016 - Revision a9b4be5
Open non-feature issues in
Mantis: 123
Group: Standard
fso_Standard_20160104_a9b4be5.tar.bz2MD5Sum------------------------------------------------------------------------
commit 7691c49
Author: Echelon9 <Thu Dec 3 11:16:18 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:05 2016 -0500>
Correct comment regarding glGetString(GL_SHADING_LANGUAGE_VERSION)
code/graphics/gropengl.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 9bd4fb3
Author: Echelon9 <Sat Nov 28 17:28:05 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:05 2016 -0500>
Lift up FXAA shader GLSL version check to opengl_post_load_shader(), out of the GLSL shader compiler preprocessor stage.
code/globalincs/def_files.cpp | 8 --------
code/graphics/gropenglpostprocessing.cpp | 12 ++++++++++++
2 files changed, 12 insertions(+), 8 deletions(-)
------------------------------------------------------------------------
commit 49b5d9a
Author: Echelon9 <Sat Nov 21 00:27:49 2015 +1300>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Fix up the revert of 0345d09a513082d15b53b045471f3fe1e3621b9b
code/graphics/gropenglshader.cpp | 1 +
1 file changed, 1 insertion(+)
------------------------------------------------------------------------
commit 22f14d5
Author: Echelon9 <Sat Nov 21 00:15:00 2015 +1300>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Revert "GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards"
code/graphics/gropenglshader.cpp | 4 ----
1 file changed, 4 deletions(-)
------------------------------------------------------------------------
commit 5f4568c
Author: Echelon9 <Sun Nov 8 22:25:29 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
OpenGL: Correct typo in one use of the __VERSION__ predefined macro
code/globalincs/def_files.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit 39842e7
Author: Echelon9 <Sun Nov 8 19:41:37 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
OpenGL: Rely on predefined macro __VERSION__ in GLSL language specification, rather than rolling our own. This predefined macro has been a language feature in all GLSL versions we support. See Section 3.3 Preprocessor.
code/globalincs/def_files.cpp | 12 ++++++------
code/graphics/gropenglshader.cpp | 10 ----------
2 files changed, 6 insertions(+), 16 deletions(-)
------------------------------------------------------------------------
commit cb90d28
Author: Echelon9 <Wed Nov 4 21:54:29 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
GLSL: Provide a dynamic #version directive to the shaders, in line with OpenGL standards
code/graphics/gropenglshader.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
------------------------------------------------------------------------
commit e4c98e8
Author: Echelon9 <Wed Nov 4 18:58:24 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Remove final DirectX Shader Model concepts. OpenGL GLSL version supported by the driver can be directly queried, rather than a layer of abstraction through SM2, SM3 and SM4. Allows Use_GLSL to be removed following refactoring.
code/graphics/2d.cpp | 8 ++++----
code/graphics/grbatch.cpp | 10 +++++-----
code/graphics/gropengl.cpp | 1 -
code/graphics/gropengl.h | 1 -
code/graphics/gropengldraw.cpp | 4 ++--
code/graphics/gropenglextension.cpp | 19 +++----------------
code/graphics/gropenglshader.cpp | 4 ++--
code/graphics/gropengltnl.cpp | 4 ++--
code/model/modelinterp.cpp | 6 +++---
code/model/modelread.cpp | 5 ++---
10 files changed, 23 insertions(+), 39 deletions(-)
------------------------------------------------------------------------
commit 5d593f0
Author: Echelon9 <Wed Nov 4 18:39:25 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Plumb through is_minimum_GLSL_version()
code/cutscene/oggplayer.cpp | 2 +-
code/graphics/2d.cpp | 2 +-
code/graphics/gropengl.cpp | 4 ++--
code/graphics/gropengldraw.cpp | 2 +-
code/graphics/gropenglextension.cpp | 6 +++---
code/graphics/gropengllight.cpp | 4 ++--
code/graphics/gropenglpostprocessing.cpp | 2 +-
code/graphics/gropenglshader.cpp | 6 +++---
code/graphics/gropengltnl.cpp | 8 ++++----
code/lab/lab.cpp | 4 +---
code/lighting/lighting.cpp | 9 ++++-----
code/model/modelread.cpp | 4 ++--
code/model/modelrender.cpp | 2 +-
code/object/object.cpp | 4 +---
code/ship/ship.cpp | 4 ++--
code/weapon/beam.cpp | 16 +++++++---------
16 files changed, 36 insertions(+), 43 deletions(-)
------------------------------------------------------------------------
commit a045e5d
Author: Echelon9 <Wed Nov 4 18:09:52 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Refactor out -disable_glsl_model command line option, which is encoded in Use_GLSL internally
code/cmdline/cmdline.cpp | 6 ------
code/cmdline/cmdline.h | 1 -
code/graphics/gropenglshader.cpp | 4 ----
3 files changed, 11 deletions(-)
------------------------------------------------------------------------
commit 21b8e3b
Author: Echelon9 <Wed Nov 4 17:08:57 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Add helper function is_minimum_GLSL_version()
code/graphics/gropengl.cpp | 16 ++++++++++++++++
code/graphics/gropengl.h | 2 ++
code/graphics/gropenglextension.cpp | 2 ++
3 files changed, 20 insertions(+)
------------------------------------------------------------------------
commit 3aa671a
Author: Echelon9 <Wed Nov 4 16:28:23 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
Replace SHADER_MODEL with GLSL_VERSION
code/globalincs/def_files.cpp | 12 ++++++------
code/graphics/gropenglshader.cpp | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
------------------------------------------------------------------------
commit d3ce987
Author: Echelon9 <Wed Nov 4 16:18:50 2015 +1100>
Commit: Echelon9 <Sun Jan 3 16:33:04 2016 -0500>
DirectX Shader Model 4.0 is equivalent to GLSL version 3.30. Source: https://www.opengl.org/wiki/Detecting_the_Shader_Model
code/graphics/gropenglextension.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------------------------------
commit f57e346
Author: SamuelCho <Sat Jan 2 16:47:28 2016 -0800>
Commit: SamuelCho <Sat Jan 2 16:47:28 2016 -0800>
Only enable team glow colors if team color texture mask has an alpha channel.
code/globalincs/def_files.cpp | 5 +++--
code/graphics/gropenglshader.cpp | 2 +-
code/graphics/gropengltnl.cpp | 8 +++++++-
3 files changed, 11 insertions(+), 4 deletions(-)
