diff options
author | Ixtli <cg@325i.org> | 2010-03-03 00:36:07 +0900 |
---|---|---|
committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:40 -0400 |
commit | ef69303d12fe064332616c431f33fc69a3c740a9 (patch) | |
tree | 5ff3f56d7d377cb714410a5f3db4465e636c3813 /crawl-ref/source/glwrapper.h | |
parent | 5c4d00b30329fcff7b3f600af81af0e9a59ac3fa (diff) | |
download | crawl-ref-ef69303d12fe064332616c431f33fc69a3c740a9.tar.gz crawl-ref-ef69303d12fe064332616c431f33fc69a3c740a9.zip |
Removed tiletex dependancy on SDL_opengl and updated glwrapper.h/cc to support it
Diffstat (limited to 'crawl-ref/source/glwrapper.h')
-rw-r--r-- | crawl-ref/source/glwrapper.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/glwrapper.h b/crawl-ref/source/glwrapper.h index dbe2cfa73d..a90f846e5e 100644 --- a/crawl-ref/source/glwrapper.h +++ b/crawl-ref/source/glwrapper.h @@ -4,6 +4,8 @@ #include <stdlib.h> // For size_t #include <vector> // for std::vector +#include "tiletex.h" // for generic mipmap enums + #ifdef USE_TILE #ifdef USE_GL @@ -42,6 +44,7 @@ public: // State Manipulation static void set(const GLState& state); + static void pixelStoreUnpackAlignment(unsigned int bpp); static void pushMatrix(); static void popMatrix(); static void setProjectionMatrixMode(); @@ -74,6 +77,13 @@ public: static void drawColorBox(long unsigned int stride, size_t count, const void *pos_verts, const void *color_verts); + // Texture-specific functinos + static void deleteTextures(size_t count, unsigned int *textures); + static void generateTextures(size_t count, unsigned int *textures); + static void bindTexture(unsigned int texture); + static void loadTexture(unsigned char *pixels, unsigned int width, + unsigned int height, GenericTexture::MipMapOptions mip_opt); + // Debug #ifdef DEBUG static bool _valid(int num_verts, drawing_modes mode); |