actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for *nix build

Browse Source
This commit is contained in:
Prcuvu
2019-10-03 12:17:53 +08:00
parent dea6917f02
commit 1fa9bb387c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RageDisplay_GLES2.cpp
+5 -5
View File
@@ -559,7 +559,7 @@ RageDisplay_GLES2::SupportsPerVertexMatrixScale()
return true;
}
unsigned
uintptr_t
RageDisplay_GLES2::CreateTexture(
RagePixelFormat pixfmt,
RageSurface* img,
@@ -572,7 +572,7 @@ RageDisplay_GLES2::CreateTexture(
void
RageDisplay_GLES2::UpdateTexture(
unsigned iTexHandle,
uintptr_t iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height
)
@@ -581,7 +581,7 @@ RageDisplay_GLES2::UpdateTexture(
}
void
RageDisplay_GLES2::DeleteTexture( unsigned iTexHandle )
RageDisplay_GLES2::DeleteTexture( uintptr_t iTexHandle )
{
// TODO
}
@@ -613,7 +613,7 @@ SetTextureUnit( TextureUnit tu )
}
void
RageDisplay_GLES2::SetTexture( TextureUnit tu, unsigned iTexture )
RageDisplay_GLES2::SetTexture( TextureUnit tu, uintptr_t iTexture )
{
if (!SetTextureUnit( tu ))
return;
@@ -621,7 +621,7 @@ RageDisplay_GLES2::SetTexture( TextureUnit tu, unsigned iTexture )
if (iTexture)
{
glEnable( GL_TEXTURE_2D );
glBindTexture( GL_TEXTURE_2D, iTexture );
glBindTexture( GL_TEXTURE_2D, static_cast<GLuint>(iTexture) );
}
else
{
src/RageDisplay_GLES2.h
+4 -4
View File
@@ -18,18 +18,18 @@ public:
void SetBlendMode( BlendMode mode );
bool SupportsTextureFormat( RagePixelFormat pixfmt, bool realtime=false );
bool SupportsPerVertexMatrixScale();
unsigned CreateTexture(
uintptr_t CreateTexture(
RagePixelFormat pixfmt,
RageSurface* img,
bool bGenerateMipMaps );
void UpdateTexture(
unsigned iTexHandle,
uintptr_t iTexHandle,
RageSurface* img,
int xoffset, int yoffset, int width, int height );
void DeleteTexture( unsigned iTexHandle );
void DeleteTexture( uintptr_t iTexHandle );
void ClearAllTextures();
int GetNumTextureUnits();
void SetTexture( TextureUnit tu, unsigned iTexture );
void SetTexture( TextureUnit tu, uintptr_t iTexture );
void SetTextureMode( TextureUnit tu, TextureMode tm );
void SetTextureWrapping( TextureUnit tu, bool b );
int GetMaxTextureSize() const;
src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm
+1 -1
View File
@@ -188,7 +188,7 @@ public:
RenderTarget_MacOSX( id shareContext );
~RenderTarget_MacOSX();
void Create( const RenderTargetParam &param, int &iTextureWidthOut, int &iTextureHeightOut );
unsigned GetTexture() const { return m_iTexHandle; }
uintptr_t GetTexture() const { return static_cast<uintptr_t>(m_iTexHandle); }
void StartRenderingTo();
void FinishRenderingTo();
src/arch/LowLevelWindow/LowLevelWindow_X11.cpp
+2 -2
View File
@@ -758,7 +758,7 @@ public:
~RenderTarget_X11();
void Create( const RenderTargetParam &param, int &iTextureWidthOut, int &iTextureHeightOut );
unsigned GetTexture() const { return m_iTexHandle; }
uintptr_t GetTexture() const { return static_cast<uintptr_t>(m_iTexHandle); }
void StartRenderingTo();
void FinishRenderingTo();
@@ -770,7 +770,7 @@ private:
LowLevelWindow_X11 *m_pWind;
GLXPbuffer m_iPbuffer;
GLXContext m_pPbufferContext;
unsigned int m_iTexHandle;
GLuint m_iTexHandle;
GLXContext m_pOldContext;
GLXDrawable m_pOldDrawable;