Fix OpenGL ES compilation

This commit is contained in:
Eduardo Bart 2012-08-23 12:37:26 -03:00
parent 949cfd5d31
commit e25bd7fe54
2 changed files with 6 additions and 1 deletions

View File

@ -75,7 +75,7 @@ function onConnect(protocol)
post = post .. '&display_height=' .. g_window.getDisplayHeight() post = post .. '&display_height=' .. g_window.getDisplayHeight()
local message = '' local message = ''
message = message .. "POST /report HTTP/1.0\r\n" message = message .. "POST /report HTTP/1.1\r\n"
message = message .. "Host: " .. HOST .. "\r\n" message = message .. "Host: " .. HOST .. "\r\n"
message = message .. "Accept: */*\r\n" message = message .. "Accept: */*\r\n"
message = message .. "Connection: close\r\n" message = message .. "Connection: close\r\n"

View File

@ -235,8 +235,13 @@ void Texture::setupPixels(int level, const Size& size, uchar* pixels, int channe
} }
GLenum internalFormat = GL_RGBA; GLenum internalFormat = GL_RGBA;
#ifdef OPENGL_ES
//TODO
#else
if(compress) if(compress)
internalFormat = GL_COMPRESSED_RGBA; internalFormat = GL_COMPRESSED_RGBA;
#endif
glTexImage2D(GL_TEXTURE_2D, level, internalFormat, size.width(), size.height(), 0, format, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, level, internalFormat, size.width(), size.height(), 0, format, GL_UNSIGNED_BYTE, pixels);
} }