Skip to content

Commit

Permalink
Delete commented vid_quality_token/vid_mode_token initialization code.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Jan 25, 2016
1 parent 0d59bb3 commit 7e5ea13
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 205 deletions.
76 changes: 0 additions & 76 deletions src/Layers/xrRender/HW.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ void CHW::Reset (HWND hwnd)
#endif
}

//xr_token* vid_mode_token = NULL;
//extern xr_token* vid_mode_token;
#include "Include/xrAPI/xrAPI.h"
//xr_token* vid_quality_token = NULL;

void CHW::CreateD3D ()
{
Expand Down Expand Up @@ -599,79 +596,6 @@ struct _uniq_mode

#ifndef _EDITOR

/*
void free_render_mode_list()
{
for( int i=0; vid_quality_token[i].name; i++ )
{
xr_free (vid_quality_token[i].name);
}
xr_free (vid_quality_token);
vid_quality_token = NULL;
}
*/
/*
void fill_render_mode_list()
{
if(vid_quality_token != NULL) return;
D3DCAPS9 caps;
CHW _HW;
_HW.CreateD3D ();
_HW.pD3D->GetDeviceCaps (D3DADAPTER_DEFAULT,D3DDEVTYPE_HAL,&caps);
_HW.DestroyD3D ();
u16 ps_ver_major = u16 ( u32(u32(caps.PixelShaderVersion)&u32(0xf << 8ul))>>8 );
xr_vector<LPCSTR> _tmp;
u32 i = 0;
for(; i<5; ++i)
{
bool bBreakLoop = false;
switch (i)
{
case 3: //"renderer_r2.5"
if (ps_ver_major < 3)
bBreakLoop = true;
break;
case 4: //"renderer_r_dx10"
bBreakLoop = true;
break;
default: ;
}
if (bBreakLoop) break;
_tmp.push_back (NULL);
LPCSTR val = NULL;
switch (i)
{
case 0: val ="renderer_r1"; break;
case 1: val ="renderer_r2a"; break;
case 2: val ="renderer_r2"; break;
case 3: val ="renderer_r2.5"; break;
case 4: val ="renderer_r_dx10"; break; // -)
}
_tmp.back() = xr_strdup(val);
}
u32 _cnt = _tmp.size()+1;
vid_quality_token = xr_alloc<xr_token>(_cnt);
vid_quality_token[_cnt-1].id = -1;
vid_quality_token[_cnt-1].name = NULL;
#ifdef DEBUG
Msg("Available render modes[%d]:",_tmp.size());
#endif // DEBUG
for(u32 i=0; i<_tmp.size();++i)
{
vid_quality_token[i].id = i;
vid_quality_token[i].name = _tmp[i];
#ifdef DEBUG
Msg ("[%s]",_tmp[i]);
#endif // DEBUG
}
}
*/
void free_vid_mode_list()
{
for( int i=0; GlobalEnv.vid_mode_token[i].name; i++ )
Expand Down
122 changes: 0 additions & 122 deletions src/Layers/xrRenderDX10/dx10HW.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -798,79 +798,6 @@ struct _uniq_mode

#ifndef _EDITOR

/*
void free_render_mode_list()
{
for( int i=0; vid_quality_token[i].name; i++ )
{
xr_free (vid_quality_token[i].name);
}
xr_free (vid_quality_token);
vid_quality_token = NULL;
}
*/
/*
void fill_render_mode_list()
{
if(vid_quality_token != NULL) return;
D3DCAPS9 caps;
CHW _HW;
_HW.CreateD3D ();
_HW.pD3D->GetDeviceCaps (D3DADAPTER_DEFAULT,D3DDEVTYPE_HAL,&caps);
_HW.DestroyD3D ();
u16 ps_ver_major = u16 ( u32(u32(caps.PixelShaderVersion)&u32(0xf << 8ul))>>8 );
xr_vector<LPCSTR> _tmp;
u32 i = 0;
for(; i<5; ++i)
{
bool bBreakLoop = false;
switch (i)
{
case 3: //"renderer_r2.5"
if (ps_ver_major < 3)
bBreakLoop = true;
break;
case 4: //"renderer_r_dx10"
bBreakLoop = true;
break;
default: ;
}
if (bBreakLoop) break;
_tmp.push_back (NULL);
LPCSTR val = NULL;
switch (i)
{
case 0: val ="renderer_r1"; break;
case 1: val ="renderer_r2a"; break;
case 2: val ="renderer_r2"; break;
case 3: val ="renderer_r2.5"; break;
case 4: val ="renderer_r_dx10"; break; // -)
}
_tmp.back() = xr_strdup(val);
}
u32 _cnt = _tmp.size()+1;
vid_quality_token = xr_alloc<xr_token>(_cnt);
vid_quality_token[_cnt-1].id = -1;
vid_quality_token[_cnt-1].name = NULL;
#ifdef DEBUG
Msg("Available render modes[%d]:",_tmp.size());
#endif // DEBUG
for(u32 i=0; i<_tmp.size();++i)
{
vid_quality_token[i].id = i;
vid_quality_token[i].name = _tmp[i];
#ifdef DEBUG
Msg ("[%s]",_tmp[i]);
#endif // DEBUG
}
}
*/
void free_vid_mode_list()
{
for( int i=0; GlobalEnv.vid_mode_token[i].name; i++ )
Expand Down Expand Up @@ -921,12 +848,6 @@ void fill_vid_mode_list(CHW* _hw)
_tmp.push_back (NULL);
_tmp.back() = xr_strdup(str);
}



// _tmp.push_back (NULL);
// _tmp.back() = xr_strdup("1024x768");

u32 _cnt = _tmp.size()+1;

GlobalEnv.vid_mode_token = xr_alloc<xr_token>(_cnt);
Expand All @@ -945,49 +866,6 @@ void fill_vid_mode_list(CHW* _hw)
Msg ("[%s]",_tmp[i]);
#endif // DEBUG
}

/* Old code
if(vid_mode_token != NULL) return;
xr_vector<LPCSTR> _tmp;
u32 cnt = _hw->pD3D->GetAdapterModeCount (_hw->DevAdapter, _hw->Caps.fTarget);
u32 i;
for(i=0; i<cnt;++i)
{
D3DDISPLAYMODE Mode;
string32 str;
_hw->pD3D->EnumAdapterModes(_hw->DevAdapter, _hw->Caps.fTarget, i, &Mode);
if(Mode.Width < 800) continue;
xr_sprintf (str,sizeof(str),"%dx%d", Mode.Width, Mode.Height);
if(_tmp.end() != std::find_if(_tmp.begin(), _tmp.end(), _uniq_mode(str)))
continue;
_tmp.push_back (NULL);
_tmp.back() = xr_strdup(str);
}
u32 _cnt = _tmp.size()+1;
vid_mode_token = xr_alloc<xr_token>(_cnt);
vid_mode_token[_cnt-1].id = -1;
vid_mode_token[_cnt-1].name = NULL;
#ifdef DEBUG
Msg("Available video modes[%d]:",_tmp.size());
#endif // DEBUG
for(i=0; i<_tmp.size();++i)
{
vid_mode_token[i].id = i;
vid_mode_token[i].name = _tmp[i];
#ifdef DEBUG
Msg ("[%s]",_tmp[i]);
#endif // DEBUG
}
*/
}

void CHW::UpdateViews()
Expand Down
8 changes: 1 addition & 7 deletions src/xrEngine/xr_ioc_cmd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -543,21 +543,15 @@ ENGINE_API BOOL r2_sun_static = TRUE;
ENGINE_API BOOL r2_advanced_pp = FALSE; // advanced post process and effects

u32 renderer_value = 3;
//void fill_render_mode_list();
//void free_render_mode_list();

class CCC_r2 : public CCC_Token
{
typedef CCC_Token inherited;
public:
CCC_r2(LPCSTR N) :inherited(N, &renderer_value, NULL) { renderer_value = 3; };
virtual ~CCC_r2()
{
//free_render_mode_list();
}
virtual ~CCC_r2() {}
virtual void Execute(LPCSTR args)
{
//fill_render_mode_list ();
// vid_quality_token must be already created!
tokens = vid_quality_token;

Expand Down

0 comments on commit 7e5ea13

Please sign in to comment.