Merge branch 'svn/trunk' r4319
This commit is contained in:
commit
be6b446028
7 changed files with 1026 additions and 29 deletions
|
@ -80,11 +80,15 @@ typedef struct {
|
|||
Bit8u *cacheRead;
|
||||
Bitu inHeight, inLine, outLine;
|
||||
} scale;
|
||||
#if C_OPENGL
|
||||
char* shader_src;
|
||||
#endif
|
||||
RenderPal_t pal;
|
||||
bool updating;
|
||||
bool active;
|
||||
bool aspect;
|
||||
bool fullFrame;
|
||||
bool forceUpdate;
|
||||
} Render_t;
|
||||
|
||||
extern Render_t render;
|
||||
|
@ -93,6 +97,8 @@ void RENDER_SetSize(Bitu width,Bitu height,Bitu bpp,float fps,double ratio,bool
|
|||
bool RENDER_StartUpdate(void);
|
||||
void RENDER_EndUpdate(bool abort);
|
||||
void RENDER_SetPal(Bit8u entry,Bit8u red,Bit8u green,Bit8u blue);
|
||||
bool RENDER_GetForceUpdate(void);
|
||||
void RENDER_SetForceUpdate(bool);
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -51,6 +51,7 @@ void GFX_Events(void);
|
|||
Bitu GFX_GetBestMode(Bitu flags);
|
||||
Bitu GFX_GetRGB(Bit8u red,Bit8u green,Bit8u blue);
|
||||
Bitu GFX_SetSize(Bitu width,Bitu height,Bitu flags,double scalex,double scaley,GFX_CallBack_t cb);
|
||||
void GFX_SetShader(const char* src);
|
||||
|
||||
void GFX_ResetScreen(void);
|
||||
void GFX_Start(void);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue