[rbdoom3bfg] 01/03: Imported Upstream version 1.0.3+repack1+git20151124
Tobias Frost
tobi at moszumanska.debian.org
Tue Nov 24 18:42:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit c7926884fd95ef740e7f084f41f8ef34a269891a
Author: Tobias Frost <tobi at coldtobi.de>
Date: Tue Nov 24 19:40:24 2015 +0100
Imported Upstream version 1.0.3+repack1+git20151124
---
ChangeLog | 16 ++++
base/default.cfg | 152 ++++++++++++++++++-------------------
neo/renderer/RenderProgs_GLSL.cpp | 7 ++
neo/renderer/RenderSystem.cpp | 2 +-
neo/renderer/RenderSystem.h | 1 +
neo/renderer/RenderSystem_init.cpp | 75 +++++++++++++-----
6 files changed, 156 insertions(+), 97 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 541bfb6..442b9bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2015-11-23 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Changed extension check for GL_ARB_framebuffer_object
+
+2015-11-23 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Workarounds for Mesa. closes #256 #245
+
+2015-11-17 Robert Beckebans <robert.beckebans at gmail.com>
+
+ * Merge pull request #254 from BielBdeLuna/mesa_glsl_fix
+
+2015-11-17 BielBdeLuna <7318.tk at gmail.com>
+
+ * glsl creation fix
+
2015-10-22 Robert Beckebans <robert.beckebans at gmail.com>
* Merge remote-tracking branch 'RBDOOM-3-BFG/master'
diff --git a/base/default.cfg b/base/default.cfg
index 7520678..35fc9f9 100644
--- a/base/default.cfg
+++ b/base/default.cfg
@@ -1,76 +1,76 @@
-//
-// KEY BINDINGS
-//
-
-unbindall
-
-//
-// weapons
-//
-bind 1 "_impulse0" // weap
-bind 2 "_impulse2" // weap
-bind 3 "_impulse3" // weap
-bind 4 "_impulse5" // weap
-bind 5 "_impulse6" // weap
-bind 6 "_impulse7" // weap
-bind 7 "_impulse8" // weap
-bind 8 "_impulse9" // weap
-bind 9 "_impulse10" // weap
-//bind 0 "_impulse11" // weap
-bind q "_impulse12" // weap
-
-bind TAB "_impulse19" // PDA in SP, scoreboard in MP
-bind r "_impulse13" // reload
-bind f "_impulse16" // Flash Light
-
-bind [ "_impulse15"
-bind ] "_impulse14"
-bind / "_impulse14"
-bind ENTER _button2
-
-bind mwheelup "_impulse15"
-bind mwheeldown "_impulse14"
-
-//
-// CHARACTER CONTROLS
-//
-
-bind CTRL _attack
-
-bind SHIFT _speed
-
-bind DEL _lookdown
-bind PGDN _lookup
-
-bind c _movedown
-bind SPACE _moveup
-
-
-bind UPARROW _forward
-bind DOWNARROW _back
-bind LEFTARROW _left
-bind RIGHTARROW _right
-bind w _forward
-bind a _moveleft
-bind s _back
-bind d _moveright
-bind e _use
-
-//
-// CLIENT ENVIRONMENT COMMANDS
-//
-
-bind F5 "savegame quick"
-bind F9 "loadgame quick"
-bind F12 screenshot
-
-bind t clientMessageMode
-bind y "clientMessageMode 1"
-
-//
-// MOUSE BUTTONS
-//
-
-bind MOUSE1 _attack
-bind MOUSE2 _moveup
-
+//
+// KEY BINDINGS
+//
+
+unbindall
+
+//
+// weapons
+//
+bind 1 "_impulse0" // weap
+bind 2 "_impulse2" // weap
+bind 3 "_impulse3" // weap
+bind 4 "_impulse5" // weap
+bind 5 "_impulse6" // weap
+bind 6 "_impulse7" // weap
+bind 7 "_impulse8" // weap
+bind 8 "_impulse9" // weap
+bind 9 "_impulse10" // weap
+//bind 0 "_impulse11" // weap
+bind q "_impulse12" // weap
+
+bind TAB "_impulse19" // PDA in SP, scoreboard in MP
+bind r "_impulse13" // reload
+bind f "_impulse16" // Flash Light
+
+bind [ "_impulse15"
+bind ] "_impulse14"
+bind / "_impulse14"
+bind ENTER _button2
+
+bind mwheelup "_impulse15"
+bind mwheeldown "_impulse14"
+
+//
+// CHARACTER CONTROLS
+//
+
+bind CTRL _attack
+
+bind SHIFT _speed
+
+bind DEL _lookdown
+bind PGDN _lookup
+
+bind c _movedown
+bind SPACE _moveup
+
+
+bind UPARROW _forward
+bind DOWNARROW _back
+bind LEFTARROW _left
+bind RIGHTARROW _right
+bind w _forward
+bind a _moveleft
+bind s _back
+bind d _moveright
+bind e _use
+
+//
+// CLIENT ENVIRONMENT COMMANDS
+//
+
+bind F5 "savegame quick"
+bind F9 "loadgame quick"
+bind F12 screenshot
+
+bind t clientMessageMode
+bind y "clientMessageMode 1"
+
+//
+// MOUSE BUTTONS
+//
+
+bind MOUSE1 _attack
+bind MOUSE2 _moveup
+
diff --git a/neo/renderer/RenderProgs_GLSL.cpp b/neo/renderer/RenderProgs_GLSL.cpp
index 7898557..743b67d 100644
--- a/neo/renderer/RenderProgs_GLSL.cpp
+++ b/neo/renderer/RenderProgs_GLSL.cpp
@@ -971,6 +971,13 @@ const char* fragmentInsert_GLSL_ES_3_00 =
"#version 300 es\n"
"#define PC\n"
"precision mediump float;\n"
+ "precision lowp sampler2D;\n"
+ "precision lowp sampler2DShadow;\n"
+ "precision lowp sampler2DArray;\n"
+ "precision lowp sampler2DArrayShadow;\n"
+ "precision lowp samplerCube;\n"
+ "precision lowp samplerCubeShadow;\n"
+ "precision lowp sampler3D;\n"
"\n"
"void clip( float v ) { if ( v < 0.0 ) { discard; } }\n"
"void clip( vec2 v ) { if ( any( lessThan( v, vec2( 0.0 ) ) ) ) { discard; } }\n"
diff --git a/neo/renderer/RenderSystem.cpp b/neo/renderer/RenderSystem.cpp
index 059e84d..de03c11 100644
--- a/neo/renderer/RenderSystem.cpp
+++ b/neo/renderer/RenderSystem.cpp
@@ -311,7 +311,7 @@ static void R_CheckCvars()
{
case GLDRV_OPENGL_ES2:
case GLDRV_OPENGL_ES3:
- case GLDRV_OPENGL_MESA:
+ //case GLDRV_OPENGL_MESA:
r_useShadowMapping.SetInteger( 0 );
break;
diff --git a/neo/renderer/RenderSystem.h b/neo/renderer/RenderSystem.h
index c21088f..9bac48b 100644
--- a/neo/renderer/RenderSystem.h
+++ b/neo/renderer/RenderSystem.h
@@ -94,6 +94,7 @@ enum graphicsDriverType_t
GLDRV_OPENGL_ES2,
GLDRV_OPENGL_ES3,
GLDRV_OPENGL_MESA, // fear this, it is probably the best to disable GPU skinning and run shaders in GLSL ES 1.0
+ GLDRV_OPENGL_MESA_CORE_PROFILE
};
// RB end
diff --git a/neo/renderer/RenderSystem_init.cpp b/neo/renderer/RenderSystem_init.cpp
index 150ca36..26dd497 100644
--- a/neo/renderer/RenderSystem_init.cpp
+++ b/neo/renderer/RenderSystem_init.cpp
@@ -350,12 +350,19 @@ static void R_CheckPortableExtensions()
// RB: Mesa support
if( idStr::Icmpn( glConfig.renderer_string, "Mesa", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "X.org", 4 ) == 0 || idStr::Icmpn( glConfig.renderer_string, "Gallium", 7 ) == 0 )
{
- glConfig.driverType = GLDRV_OPENGL_MESA;
+ if( glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE )
+ {
+ glConfig.driverType = GLDRV_OPENGL_MESA_CORE_PROFILE;
+ }
+ else
+ {
+ glConfig.driverType = GLDRV_OPENGL_MESA;
+ }
}
// RB end
// GL_ARB_multitexture
- if( glConfig.driverType == GLDRV_OPENGL32_COMPATIBILITY_PROFILE || glConfig.driverType == GLDRV_OPENGL32_CORE_PROFILE || glConfig.driverType == GLDRV_OPENGL_MESA )
+ if( glConfig.driverType != GLDRV_OPENGL3X )
{
glConfig.multitextureAvailable = true;
}
@@ -370,8 +377,14 @@ static void R_CheckPortableExtensions()
// GL_ARB_texture_compression + GL_S3_s3tc
// DRI drivers may have GL_ARB_texture_compression but no GL_EXT_texture_compression_s3tc
- glConfig.textureCompressionAvailable = GLEW_ARB_texture_compression != 0 && GLEW_EXT_texture_compression_s3tc != 0;
-
+ if( glConfig.driverType == GLDRV_OPENGL_MESA_CORE_PROFILE )
+ {
+ glConfig.textureCompressionAvailable = true;
+ }
+ else
+ {
+ glConfig.textureCompressionAvailable = GLEW_ARB_texture_compression != 0 && GLEW_EXT_texture_compression_s3tc != 0;
+ }
// GL_EXT_texture_filter_anisotropic
glConfig.anisotropicFilterAvailable = GLEW_EXT_texture_filter_anisotropic != 0;
if( glConfig.anisotropicFilterAvailable )
@@ -406,13 +419,34 @@ static void R_CheckPortableExtensions()
r_useSRGB.SetModified(); // the CheckCvars() next frame will enable / disable it
// GL_ARB_vertex_buffer_object
- glConfig.vertexBufferObjectAvailable = GLEW_ARB_vertex_buffer_object != 0;
+ if( glConfig.driverType == GLDRV_OPENGL_MESA_CORE_PROFILE )
+ {
+ glConfig.vertexBufferObjectAvailable = true;
+ }
+ else
+ {
+ glConfig.vertexBufferObjectAvailable = GLEW_ARB_vertex_buffer_object != 0;
+ }
// GL_ARB_map_buffer_range, map a section of a buffer object's data store
- glConfig.mapBufferRangeAvailable = GLEW_ARB_map_buffer_range != 0;
+ //if( glConfig.driverType == GLDRV_OPENGL_MESA_CORE_PROFILE )
+ //{
+ // glConfig.mapBufferRangeAvailable = true;
+ //}
+ //else
+ {
+ glConfig.mapBufferRangeAvailable = GLEW_ARB_map_buffer_range != 0;
+ }
// GL_ARB_vertex_array_object
- glConfig.vertexArrayObjectAvailable = GLEW_ARB_vertex_array_object != 0;
+ //if( glConfig.driverType == GLDRV_OPENGL_MESA_CORE_PROFILE )
+ //{
+ // glConfig.vertexArrayObjectAvailable = true;
+ //}
+ //else
+ {
+ glConfig.vertexArrayObjectAvailable = GLEW_ARB_vertex_array_object != 0;
+ }
// GL_ARB_draw_elements_base_vertex
glConfig.drawElementsBaseVertexAvailable = GLEW_ARB_draw_elements_base_vertex != 0;
@@ -470,18 +504,18 @@ static void R_CheckPortableExtensions()
common->Printf( "X..%s not found\n", "GL_GREMEDY_string_marker" );
}
- // GL_EXT_framebuffer_object
- glConfig.framebufferObjectAvailable = GLEW_EXT_framebuffer_object != 0;
+ // GL_ARB_framebuffer_object
+ glConfig.framebufferObjectAvailable = GLEW_ARB_framebuffer_object != 0;
if( glConfig.framebufferObjectAvailable )
{
glGetIntegerv( GL_MAX_RENDERBUFFER_SIZE, &glConfig.maxRenderbufferSize );
glGetIntegerv( GL_MAX_COLOR_ATTACHMENTS, &glConfig.maxColorAttachments );
- common->Printf( "...using %s\n", "GL_EXT_framebuffer_object" );
+ common->Printf( "...using %s\n", "GL_ARB_framebuffer_object" );
}
else
{
- common->Printf( "X..%s not found\n", "GL_EXT_framebuffer_object" );
+ common->Printf( "X..%s not found\n", "GL_ARB_framebuffer_object" );
}
// GL_EXT_framebuffer_blit
@@ -492,7 +526,7 @@ static void R_CheckPortableExtensions()
}
else
{
- common->Printf( "X..%s not found\n", "GL_EXT_framebuffer_object" );
+ common->Printf( "X..%s not found\n", "GL_EXT_framebuffer_blit" );
}
// GL_ARB_debug_output
@@ -549,10 +583,10 @@ static void R_CheckPortableExtensions()
idLib::Error( "GL_ARB_draw_elements_base_vertex not available" );
}
// GL_ARB_vertex_program / GL_ARB_fragment_program
- if( !glConfig.fragmentProgramAvailable )
- {
- idLib::Warning( "GL_ARB_fragment_program not available" );
- }
+ //if( !glConfig.fragmentProgramAvailable )
+ //{
+ // idLib::Warning( "GL_ARB_fragment_program not available" );
+ //}
// GLSL
if( !glConfig.glslAvailable )
{
@@ -793,10 +827,11 @@ void R_InitOpenGL()
float glVersion = atof( glConfig.version_string );
float glslVersion = atof( glConfig.shading_language_string );
- idLib::Printf( "OpenGL Version : %3.1f\n", glVersion );
- idLib::Printf( "OpenGL Vendor : %s\n", glConfig.vendor_string );
- idLib::Printf( "OpenGL Renderer : %s\n", glConfig.renderer_string );
- idLib::Printf( "OpenGL GLSL : %3.1f\n", glslVersion );
+ idLib::Printf( "OpenGL Version : %3.1f\n", glVersion );
+ idLib::Printf( "OpenGL Vendor : %s\n", glConfig.vendor_string );
+ idLib::Printf( "OpenGL Renderer : %s\n", glConfig.renderer_string );
+ idLib::Printf( "OpenGL GLSL : %3.1f\n", glslVersion );
+ idLib::Printf( "OpenGL Extensions: %s\n", glConfig.extensions_string );
// OpenGL driver constants
GLint temp;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
More information about the Pkg-games-commits
mailing list