Browse Source

ref_soft: Merge pull request #1 from a1batross/master

update to latest API version
pull/2/head
mittorn 6 years ago committed by GitHub
parent
commit
a2cba95a3a
  1. 10
      r_context.c
  2. 2
      r_local.h
  3. 10
      r_main.c

10
r_context.c

@ -314,12 +314,6 @@ void GAME_EXPORT GL_SetTexCoordArrayMode() @@ -314,12 +314,6 @@ void GAME_EXPORT GL_SetTexCoordArrayMode()
}
void GAME_EXPORT GL_OnContextCreated()
{
//R_InitBlit();
}
void GAME_EXPORT GL_InitExtensions()
{
@ -364,12 +358,13 @@ void GAME_EXPORT R_SetupSky(const char *skyboxname) @@ -364,12 +358,13 @@ void GAME_EXPORT R_SetupSky(const char *skyboxname)
qboolean GAME_EXPORT VID_ScreenShot(const char *filename, int shot_type)
{
return false;
}
qboolean GAME_EXPORT VID_CubemapShot(const char *base, uint size, const float *vieworg, qboolean skyshot)
{
// cubemaps? in my softrender???
return false;
}
void R_InitSkyClouds(mip_t *mt, texture_t *tx, qboolean custom_palette)
@ -457,7 +452,6 @@ ref_interface_t gReffuncs = @@ -457,7 +452,6 @@ ref_interface_t gReffuncs =
R_Shutdown,
GL_SetupAttributes,
GL_OnContextCreated,
GL_InitExtensions,
GL_ClearExtensions,

2
r_local.h

@ -613,7 +613,7 @@ void GL_FreeImage( const char *name ); @@ -613,7 +613,7 @@ void GL_FreeImage( const char *name );
qboolean VID_ScreenShot( const char *filename, int shot_type );
qboolean VID_CubemapShot( const char *base, uint size, const float *vieworg, qboolean skyshot );
void R_BeginFrame( qboolean clearScene );
int R_RenderFrame( const struct ref_viewpass_s *vp );
void R_RenderFrame( const struct ref_viewpass_s *vp );
void R_EndFrame( void );
void R_ClearScene( void );
void R_GetTextureParms( int *w, int *h, int texnum );

10
r_main.c

@ -1741,14 +1741,14 @@ void R_SetupRefParams( const ref_viewpass_t *rvp ) @@ -1741,14 +1741,14 @@ void R_SetupRefParams( const ref_viewpass_t *rvp )
R_RenderFrame
===============
*/
int GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp )
void GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp )
{
if( r_norefresh->value )
return 1;
return;
// prevent cache overrun
if( gpGlobals->height > vid.height || gpGlobals->width > vid.width )
return 1;
return;
// setup the initial render params
R_SetupRefParams( rvp );
@ -1763,7 +1763,7 @@ int GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp ) @@ -1763,7 +1763,7 @@ int GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp )
//R_GatherPlayerLight();
tr.realframecount++;
tr.fResetVis = true;
return 1;
return;
}
}
@ -1774,7 +1774,7 @@ int GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp ) @@ -1774,7 +1774,7 @@ int GAME_EXPORT R_RenderFrame( const ref_viewpass_t *rvp )
tr.realframecount++; // right called after viewmodel events
R_RenderScene();
return 1;
return;
}
/*

Loading…
Cancel
Save