TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 03:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

detect SM4 and SM5

Browse Source
This commit is contained in:
rdb 2013-02-05 12:08:58 +00:00
parent 554e009070
commit 1b76a13784
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/display/graphicsStateGuardian.h
View File

@ -75,14 +75,14 @@ public:
PUBLISHED: PUBLISHED:
enum ShaderModel enum ShaderModel {
{
SM_00, SM_00,
SM_11, SM_11,
SM_20, SM_20,
SM_2X, SM_2X,
SM_30, SM_30,
SM_40, SM_40,
SM_50,
}; };
INLINE void release_all(); INLINE void release_all();

5
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -2352,9 +2352,12 @@ reset() {
_shader_model = SM_30; _shader_model = SM_30;
break; break;
case 4: case 4:
default:
_shader_model = SM_40; _shader_model = SM_40;
break; break;
case 5:
default:
_shader_model = SM_50;
break;
} }
_auto_detect_shader_model = _shader_model; _auto_detect_shader_model = _shader_model;

14
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -1718,14 +1718,20 @@ reset() {
#if defined(HAVE_CG) && !defined(OPENGLES) #if defined(HAVE_CG) && !defined(OPENGLES)
typedef struct typedef struct {
{
CGprofile cg_profile; CGprofile cg_profile;
int shader_model; int shader_model;
} } CG_PROFILE_TO_SHADER_MODEL;
CG_PROFILE_TO_SHADER_MODEL;
static CG_PROFILE_TO_SHADER_MODEL cg_profile_to_shader_model_array[] = { static CG_PROFILE_TO_SHADER_MODEL cg_profile_to_shader_model_array[] = {
// gp5fp - OpenGL fragment profile for GeForce 400 Series and up
CG_PROFILE_GP5FP,
SM_50,
// gp4fp - OpenGL fragment profile for G8x (GeForce 8xxx and up)
CG_PROFILE_GP4FP,
SM_40,
// fp40 - OpenGL fragment profile for NV4x (GeForce 6xxx and 7xxx // fp40 - OpenGL fragment profile for NV4x (GeForce 6xxx and 7xxx
// Series, NV4x-based Quadro FX, etc.) // Series, NV4x-based Quadro FX, etc.)
CG_PROFILE_FP40, CG_PROFILE_FP40,