summaryrefslogtreecommitdiffstats
path: root/src/osd/modules/render/drawogl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/render/drawogl.h')
-rw-r--r--src/osd/modules/render/drawogl.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/osd/modules/render/drawogl.h b/src/osd/modules/render/drawogl.h
index c96c3a45b1b..bf70a96ee94 100644
--- a/src/osd/modules/render/drawogl.h
+++ b/src/osd/modules/render/drawogl.h
@@ -19,7 +19,7 @@
#include "window.h"
#else
#include "../windows/window.h"
-typedef UINT64 HashT;
+typedef uint64_t HashT;
#endif
#if defined(OSD_WINDOWS)
@@ -58,7 +58,7 @@ public:
}
HashT hash; // hash value for the texture (must be >= pointer size)
- UINT32 flags; // rendering flags
+ uint32_t flags; // rendering flags
render_texinfo texinfo; // copy of the texture info
int rawwidth, rawheight; // raw width/height of the texture
int rawwidth_create; // raw width/height, pow2 compatible, if needed
@@ -70,21 +70,21 @@ public:
int yprescale; // what is our Y prescale factor?
int nocopy; // must the texture date be copied?
- UINT32 texture; // OpenGL texture "name"/ID
+ uint32_t texture; // OpenGL texture "name"/ID
GLenum texTarget; // OpenGL texture target
int texpow2; // Is this texture pow2
- UINT32 mpass_dest_idx; // Multipass dest idx [0..1]
- UINT32 mpass_textureunit[2]; // texture unit names for GLSL
+ uint32_t mpass_dest_idx; // Multipass dest idx [0..1]
+ uint32_t mpass_textureunit[2]; // texture unit names for GLSL
- UINT32 mpass_texture_mamebm[2];// Multipass OpenGL texture "name"/ID for the shader
- UINT32 mpass_fbo_mamebm[2]; // framebuffer object for this texture, multipass
- UINT32 mpass_texture_scrn[2]; // Multipass OpenGL texture "name"/ID for the shader
- UINT32 mpass_fbo_scrn[2]; // framebuffer object for this texture, multipass
+ uint32_t mpass_texture_mamebm[2];// Multipass OpenGL texture "name"/ID for the shader
+ uint32_t mpass_fbo_mamebm[2]; // framebuffer object for this texture, multipass
+ uint32_t mpass_texture_scrn[2]; // Multipass OpenGL texture "name"/ID for the shader
+ uint32_t mpass_fbo_scrn[2]; // framebuffer object for this texture, multipass
- UINT32 pbo; // pixel buffer object for this texture (DYNAMIC only!)
- UINT32 *data; // pixels for the texture
+ uint32_t pbo; // pixel buffer object for this texture (DYNAMIC only!)
+ uint32_t *data; // pixels for the texture
int data_own; // do we own / allocated it ?
GLfloat texCoord[8];
GLuint texCoordBufferName;
@@ -162,8 +162,8 @@ public:
#endif
private:
- static const UINT32 HASH_SIZE = ((1 << 10) + 1);
- static const UINT32 OVERFLOW_SIZE = (1 << 10);
+ static const uint32_t HASH_SIZE = ((1 << 10) + 1);
+ static const uint32_t OVERFLOW_SIZE = (1 << 10);
void destroy_all_textures();
@@ -171,14 +171,14 @@ private:
void loadGLExtensions();
void initialize_gl();
void set_blendmode(int blendmode);
- HashT texture_compute_hash(const render_texinfo *texture, UINT32 flags);
- void texture_compute_type_subroutine(const render_texinfo *texsource, ogl_texture_info *texture, UINT32 flags);
- void texture_compute_size_subroutine(ogl_texture_info *texture, UINT32 flags,
- UINT32 width, UINT32 height,
+ HashT texture_compute_hash(const render_texinfo *texture, uint32_t flags);
+ void texture_compute_type_subroutine(const render_texinfo *texsource, ogl_texture_info *texture, uint32_t flags);
+ void texture_compute_size_subroutine(ogl_texture_info *texture, uint32_t flags,
+ uint32_t width, uint32_t height,
int* p_width, int* p_height, int* p_width_create, int* p_height_create);
- void texture_compute_size_type(const render_texinfo *texsource, ogl_texture_info *texture, UINT32 flags);
- ogl_texture_info *texture_create(const render_texinfo *texsource, UINT32 flags);
- int texture_shader_create(const render_texinfo *texsource, ogl_texture_info *texture, UINT32 flags);
+ void texture_compute_size_type(const render_texinfo *texsource, ogl_texture_info *texture, uint32_t flags);
+ ogl_texture_info *texture_create(const render_texinfo *texsource, uint32_t flags);
+ int texture_shader_create(const render_texinfo *texsource, ogl_texture_info *texture, uint32_t flags);
ogl_texture_info *texture_find(const render_primitive *prim);
void texture_coord_update(ogl_texture_info *texture, const render_primitive *prim, int shaderIdx);
void texture_mpass_flip(ogl_texture_info *texture, int shaderIdx);
@@ -187,7 +187,7 @@ private:
void texture_disable(ogl_texture_info * texture);
void texture_all_disable();
- INT32 m_blittimer;
+ int32_t m_blittimer;
int m_width;
int m_height;
osd_dim m_blit_dim;
@@ -198,8 +198,8 @@ private:
// 3D info (GL mode only)
ogl_texture_info * m_texhash[HASH_SIZE + OVERFLOW_SIZE];
int m_last_blendmode; // previous blendmode
- INT32 m_texture_max_width; // texture maximum width
- INT32 m_texture_max_height; // texture maximum height
+ int32_t m_texture_max_width; // texture maximum width
+ int32_t m_texture_max_height; // texture maximum height
int m_texpoweroftwo; // must textures be power-of-2 sized?
int m_usevbo; // runtime check if VBO is available
int m_usepbo; // runtime check if PBO is available
@@ -224,8 +224,8 @@ private:
float m_last_vofs;
// Static vars from draogl_window_dra
- INT32 m_surf_w;
- INT32 m_surf_h;
+ int32_t m_surf_w;
+ int32_t m_surf_h;
GLfloat m_texVerticex[8];
static bool s_shown_video_info;