forked from enlightenment/efl
parent
31a6c2aa9b
commit
f31a506708
|
@ -283,7 +283,7 @@ _evas_gl_common_texture_set(Evas_GL_Context *gc)
|
||||||
{
|
{
|
||||||
if (gc->font_texture_not_power_of_two)
|
if (gc->font_texture_not_power_of_two)
|
||||||
{
|
{
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->font_texture);
|
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->font_texture);
|
||||||
}
|
}
|
||||||
|
@ -299,14 +299,14 @@ _evas_gl_common_texture_set(Evas_GL_Context *gc)
|
||||||
{
|
{
|
||||||
if (gc->texture->not_power_of_two)
|
if (gc->texture->not_power_of_two)
|
||||||
{
|
{
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->texture->texture);
|
glBindTexture(GL_TEXTURE_RECTANGLE_NV, gc->texture->texture);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
|
if (gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glBindTexture(GL_TEXTURE_2D, gc->texture->texture);
|
glBindTexture(GL_TEXTURE_2D, gc->texture->texture);
|
||||||
}
|
}
|
||||||
if (gc->texture->not_power_of_two)
|
if (gc->texture->not_power_of_two)
|
||||||
|
|
|
@ -25,7 +25,7 @@ evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image *im, int smooth)
|
||||||
tex->smooth = smooth;
|
tex->smooth = smooth;
|
||||||
tex->changed = 1;
|
tex->changed = 1;
|
||||||
|
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
glGenTextures(1, &(tex->texture));
|
glGenTextures(1, &(tex->texture));
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture);
|
glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture);
|
||||||
|
@ -65,7 +65,6 @@ evas_gl_common_texture_new(Evas_GL_Context *gc, RGBA_Image *im, int smooth)
|
||||||
tex->references = 0;
|
tex->references = 0;
|
||||||
tex->smooth = 0;
|
tex->smooth = 0;
|
||||||
tex->changed = 1;
|
tex->changed = 1;
|
||||||
if (gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
|
|
||||||
glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glGenTextures(1, &(tex->texture));
|
glGenTextures(1, &(tex->texture));
|
||||||
glBindTexture(GL_TEXTURE_2D, tex->texture);
|
glBindTexture(GL_TEXTURE_2D, tex->texture);
|
||||||
|
@ -150,7 +149,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth)
|
||||||
{
|
{
|
||||||
void *tmp = NULL, *data;
|
void *tmp = NULL, *data;
|
||||||
|
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture);
|
glBindTexture(GL_TEXTURE_RECTANGLE_NV, tex->texture);
|
||||||
|
|
||||||
|
@ -198,7 +197,7 @@ evas_gl_common_texture_update(Evas_GL_Texture *tex, RGBA_Image *im, int smooth)
|
||||||
tex->changed = 1;
|
tex->changed = 1;
|
||||||
tex->have_mipmaps = 0;
|
tex->have_mipmaps = 0;
|
||||||
if (tex->gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
|
if (tex->gc->ext.nv_texture_rectangle) glDisable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
// glEnable(GL_TEXTURE_2D);
|
glEnable(GL_TEXTURE_2D);
|
||||||
if (tex->not_power_of_two)
|
if (tex->not_power_of_two)
|
||||||
{
|
{
|
||||||
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
glEnable(GL_TEXTURE_RECTANGLE_NV);
|
||||||
|
|
Loading…
Reference in New Issue