summaryrefslogtreecommitdiffstats
path: root/src/graphics/engine/text.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-09-29 10:40:11 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-09-29 10:40:11 +0200
commit677ce3960cd13cbf994311c76d75b343b22fd480 (patch)
treeee2bab43ec29cdf94d8c1173ee022fe95c2a0222 /src/graphics/engine/text.h
parent77952a85e63ca13dd9cfc93c7b6a271d7c91e59a (diff)
downloadcolobot-677ce3960cd13cbf994311c76d75b343b22fd480.tar.gz
colobot-677ce3960cd13cbf994311c76d75b343b22fd480.tar.bz2
colobot-677ce3960cd13cbf994311c76d75b343b22fd480.zip
Some fixes and optimizations
- fixed 2nd texture setting - added padding to some structs for faster access - changed rendering primitives to glDrawArrays() - optimized texture modesetting calls - fixed some valgrind errors
Diffstat (limited to 'src/graphics/engine/text.h')
-rw-r--r--src/graphics/engine/text.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h
index cc18f55..7fa8768 100644
--- a/src/graphics/engine/text.h
+++ b/src/graphics/engine/text.h
@@ -149,9 +149,12 @@ enum FontMask
struct UTF8Char
{
char c1, c2, c3;
+ // Padding for 4-byte alignment
+ // It also seems to fix some problems reported by valgrind
+ char pad;
explicit UTF8Char(char ch1 = '\0', char ch2 = '\0', char ch3 = '\0')
- : c1(ch1), c2(ch2), c3(ch3) {}
+ : c1(ch1), c2(ch2), c3(ch3), pad('\0') {}
inline bool operator<(const UTF8Char &other) const
{