diff options
| author | Tony Wasserka <neobrainx@gmail.com> | 2014-05-06 11:37:11 +0200 |
|---|---|---|
| committer | Tony Wasserka <neobrainx@gmail.com> | 2014-05-06 11:37:11 +0200 |
| commit | b4e1ac5f080d630d33842822b8e3470d2c62abc3 (patch) | |
| tree | daec76cef688c25d7d1f02cfff205c8c4e958b86 /Source/Core/VideoBackends | |
| parent | 0bfec024e91dd0bb7f4043375ecd7399637daa6e (diff) | |
| parent | 813e30ec2a337e09b5a0339144c9f6b4d356b9a8 (diff) | |
Merge pull request #185 from degasus/shader-cleanup
Shader cleanup
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/RasterFont.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index 8e6ad2d6c8..d281f9a554 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -10,10 +10,10 @@ namespace OGL { -static const u32 char_width = 8; -static const u32 char_height = 13; -static const u32 char_offset = 32; -static const u32 char_count = 95; +static const int char_width = 8; +static const int char_height = 13; +static const int char_offset = 32; +static const int char_count = 95; const u8 rasters[char_count][char_height] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, @@ -141,11 +141,11 @@ RasterFont::RasterFont() glActiveTexture(GL_TEXTURE0+8); glBindTexture(GL_TEXTURE_2D, texture); u32* texture_data = new u32[char_width*char_count*char_height]; - for (u32 y = 0; y < char_height; y++) + for (int y = 0; y < char_height; y++) { - for (u32 c = 0; c < char_count; c++) + for (int c = 0; c < char_count; c++) { - for (u32 x = 0; x < char_width; x++) + for (int x = 0; x < char_width; x++) { bool pixel = (0 != (rasters[c][y] & (1<<(char_width-x-1)))); texture_data[char_width*char_count*y+char_width*c+x] = pixel ? -1 : 0; |