forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

textures with GLObject

This commit is contained in:
gazer 2015-12-12 01:34:24 +03:00
parent 9896492018
commit 8336f9c9cb
2 changed files with 71 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/dlangui/graphics/gldrawbuf.d
View File

@ -105,8 +105,8 @@ class GLDrawBuf : DrawBuf, GLConfigCallback {
if (!isFullyTransparentColor(color) && applyClipping(rc)) if (!isFullyTransparentColor(color) && applyClipping(rc))
_scene.add(new SolidRectSceneItem(rc, color)); _scene.add(new SolidRectSceneItem(rc, color));
} }
/// draw pixel at (x, y) with specified color /// draw pixel at (x, y) with specified color
override void drawPixel(int x, int y, uint color) { override void drawPixel(int x, int y, uint color) {
assert(_scene !is null); assert(_scene !is null);
if (!_clipRect.isPointInside(x, y)) if (!_clipRect.isPointInside(x, y))
return; return;
@ -114,7 +114,7 @@ class GLDrawBuf : DrawBuf, GLConfigCallback {
if (isFullyTransparentColor(color)) if (isFullyTransparentColor(color))
return; return;
_scene.add(new SolidRectSceneItem(Rect(x, y, x + 1, y + 1), color)); _scene.add(new SolidRectSceneItem(Rect(x, y, x + 1, y + 1), color));
} }
/// draw 8bit alpha image - usually font glyph using specified color (clipping is applied) /// draw 8bit alpha image - usually font glyph using specified color (clipping is applied)
override void drawGlyph(int x, int y, Glyph * glyph, uint color) { override void drawGlyph(int x, int y, Glyph * glyph, uint color) {
assert(_scene !is null); assert(_scene !is null);
@ -298,7 +298,7 @@ private class GLImageCache {
private int _x; private int _x;
private bool _closed; private bool _closed;
private bool _needUpdateTexture; private bool _needUpdateTexture;
private uint _textureId; private Tex2D _texture;
private int _itemCount; private int _itemCount;
this(GLImageCache cache, int dx, int dy) { this(GLImageCache cache, int dx, int dy) {
@ -314,26 +314,26 @@ private class GLImageCache {
destroy(_drawbuf); destroy(_drawbuf);
_drawbuf = null; _drawbuf = null;
} }
if (_textureId != 0) { if (_texture.ID != 0) {
glSupport.deleteTexture(_textureId); destroy(_texture);
_textureId = 0; _texture = null;
} }
} }
void updateTexture() { void updateTexture() {
if (_drawbuf is null) if (_drawbuf is null)
return; // no draw buffer!!! return; // no draw buffer!!!
if (_textureId == 0) { if (_texture is null || _texture.ID == 0) {
_textureId = glSupport.genTexture(); _texture = new Tex2D();
Log.d("updateTexture - new texture id=", _textureId); Log.d("updateTexture - new texture id=", _texture.ID);
if (!_textureId) if (!_texture.ID)
return; return;
} }
Log.d("updateTexture for image cache page - setting image ", _drawbuf.width, "x", _drawbuf.height, " tx=", _textureId); Log.d("updateTexture for image cache page - setting image ", _drawbuf.width, "x", _drawbuf.height, " tx=", _texture.ID);
uint * pixels = _drawbuf.scanLine(0); uint * pixels = _drawbuf.scanLine(0);
if (!glSupport.setTextureImage(_textureId, _drawbuf.width, _drawbuf.height, cast(ubyte*)pixels)) { if (!glSupport.setTextureImage(_texture, _drawbuf.width, _drawbuf.height, cast(ubyte*)pixels)) {
glSupport.deleteTexture(_textureId); destroy(_texture);
_textureId = 0; _texture = null;
return; return;
} }
_needUpdateTexture = false; _needUpdateTexture = false;
@ -409,11 +409,7 @@ private class GLImageCache {
//CRLog::trace("drawing item at %d,%d %dx%d <= %d,%d %dx%d ", x, y, dx, dy, srcx, srcy, srcdx, srcdy); //CRLog::trace("drawing item at %d,%d %dx%d <= %d,%d %dx%d ", x, y, dx, dy, srcx, srcy, srcdx, srcdy);
if (_needUpdateTexture) if (_needUpdateTexture)
updateTexture(); updateTexture();
if (_textureId != 0) { if (_texture.ID != 0) {
if (!glSupport.isTexture(_textureId)) {
Log.e("Invalid texture ", _textureId);
return;
}
//rotationAngle = 0; //rotationAngle = 0;
int rx = dstrc.middlex; int rx = dstrc.middlex;
int ry = dstrc.middley; int ry = dstrc.middley;
@ -442,8 +438,8 @@ private class GLImageCache {
dstrc.bottom -= clip.bottom; dstrc.bottom -= clip.bottom;
} }
if (!dstrc.empty) if (!dstrc.empty)
glSupport.drawColorAndTextureRect(_textureId, _tdx, _tdy, srcrc, dstrc, color, srcrc.width() != dstrc.width() || srcrc.height() != dstrc.height()); glSupport.drawColorAndTextureRect(_texture, _tdx, _tdy, srcrc, dstrc, color, srcrc.width() != dstrc.width() || srcrc.height() != dstrc.height());
//drawColorAndTextureRect(vertices, texcoords, color, _textureId); //drawColorAndTextureRect(vertices, texcoords, color, _texture);
if (rotationAngle) { if (rotationAngle) {
// unset rotation // unset rotation
@ -627,7 +623,7 @@ private class GLGlyphCache {
private int _x; private int _x;
private bool _closed; private bool _closed;
private bool _needUpdateTexture; private bool _needUpdateTexture;
private uint _textureId; private Tex2D _texture;
private int _itemCount; private int _itemCount;
this(GLGlyphCache cache, int dx, int dy) { this(GLGlyphCache cache, int dx, int dy) {
@ -643,26 +639,26 @@ private class GLGlyphCache {
destroy(_drawbuf); destroy(_drawbuf);
_drawbuf = null; _drawbuf = null;
} }
if (_textureId != 0) { if (_texture.ID != 0) {
glSupport.deleteTexture(_textureId); destroy(_texture);
_textureId = 0; _texture = null;
} }
} }
void updateTexture() { void updateTexture() {
if (_drawbuf is null) if (_drawbuf is null)
return; // no draw buffer!!! return; // no draw buffer!!!
if (_textureId == 0) { if (_texture is null || _texture.ID == 0) {
_textureId = glSupport.genTexture(); _texture = new Tex2D();
//Log.d("updateTexture - new texture ", _textureId); //Log.d("updateTexture - new texture ", _texture.ID);
if (!_textureId) if (!_texture.ID)
return; return;
} }
//Log.d("updateTexture for font glyph page - setting image ", _drawbuf.width, "x", _drawbuf.height, " tx=", _textureId); //Log.d("updateTexture for font glyph page - setting image ", _drawbuf.width, "x", _drawbuf.height, " tx=", _texture.ID);
int len = _drawbuf.width * _drawbuf.height; int len = _drawbuf.width * _drawbuf.height;
if (!glSupport.setTextureImage(_textureId, _drawbuf.width, _drawbuf.height, cast(ubyte *)_drawbuf.scanLine(0))) { if (!glSupport.setTextureImage(_texture, _drawbuf.width, _drawbuf.height, cast(ubyte *)_drawbuf.scanLine(0))) {
glSupport.deleteTexture(_textureId); destroy(_texture);
_textureId = 0; _texture = null;
return; return;
} }
_needUpdateTexture = false; _needUpdateTexture = false;
@ -724,11 +720,7 @@ private class GLGlyphCache {
//CRLog::trace("drawing item at %d,%d %dx%d <= %d,%d %dx%d ", x, y, dx, dy, srcx, srcy, srcdx, srcdy); //CRLog::trace("drawing item at %d,%d %dx%d <= %d,%d %dx%d ", x, y, dx, dy, srcx, srcy, srcdx, srcdy);
if (_needUpdateTexture) if (_needUpdateTexture)
updateTexture(); updateTexture();
if (_textureId != 0) { if (_texture.ID != 0) {
if (!glSupport.isTexture(_textureId)) {
Log.e("Invalid texture ", _textureId);
return;
}
// convert coordinates to cached texture // convert coordinates to cached texture
srcrc.offset(item._rc.left, item._rc.top); srcrc.offset(item._rc.left, item._rc.top);
if (clip) { if (clip) {
@ -751,8 +743,8 @@ private class GLGlyphCache {
} }
if (!dstrc.empty) { if (!dstrc.empty) {
//Log.d("drawing glyph with color ", color); //Log.d("drawing glyph with color ", color);
glSupport.drawColorAndTextureGlyphRect(_textureId, _tdx, _tdy, srcrc, dstrc, color); glSupport.drawColorAndTextureGlyphRect(_texture, _tdx, _tdy, srcrc, dstrc, color);
//glSupport.drawColorAndTextureRect(_textureId, _tdx, _tdy, srcrc, dstrc, color, false); //glSupport.drawColorAndTextureRect(_texture, _tdx, _tdy, srcrc, dstrc, color, false);
} }
} }

150
src/dlangui/graphics/glsupport.d
View File

@ -435,18 +435,13 @@ class TextureProgram : SolidFillProgram {
return res && texCoordLocation >= 0; return res && texCoordLocation >= 0;
} }
bool execute(float[] vertices, float[] texcoords, float[] colors, uint textureId, bool linear) { bool execute(float[] vertices, float[] texcoords, float[] colors, Tex2D texture, bool linear) {
if(!check()) if(!check())
return false; return false;
beforeExecute(); beforeExecute();
glActiveTexture(GL_TEXTURE0);
checkError("glActiveTexture GL_TEXTURE0"); texture.setup();
glBindTexture(GL_TEXTURE_2D, textureId); texture.setSamplerParams(linear);
checkError("glBindTexture");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
VAO vao = new VAO(); VAO vao = new VAO();
@ -494,8 +489,7 @@ class TextureProgram : SolidFillProgram {
destroy(vbo); destroy(vbo);
destroy(vao); destroy(vao);
glBindTexture(GL_TEXTURE_2D, 0); texture.unbind();
checkError("glBindTexture");
return true; return true;
} }
} }
@ -558,18 +552,13 @@ class FontProgram : SolidFillProgram {
super.afterExecute(); super.afterExecute();
} }
bool execute(float[] vertices, float[] texcoords, float[] colors, uint textureId, bool linear) { bool execute(float[] vertices, float[] texcoords, float[] colors, Tex2D texture, bool linear) {
if(!check()) if(!check())
return false; return false;
beforeExecute(); beforeExecute();
glActiveTexture(GL_TEXTURE0);
checkError("glActiveTexture GL_TEXTURE0"); texture.setup();
glBindTexture(GL_TEXTURE_2D, textureId); texture.setSamplerParams(linear);
checkError("glBindTexture");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
VAO vao = new VAO(); VAO vao = new VAO();
@ -617,8 +606,7 @@ class FontProgram : SolidFillProgram {
destroy(vbo); destroy(vbo);
destroy(vao); destroy(vao);
glBindTexture(GL_TEXTURE_2D, 0); texture.unbind();
checkError("glBindTexture");
return true; return true;
} }
} }
@ -813,12 +801,12 @@ class GLSupport {
} }
} }
void drawColorAndTextureGlyphRect(uint textureId, int tdx, int tdy, Rect srcrc, Rect dstrc, uint color) { void drawColorAndTextureGlyphRect(Tex2D texture, int tdx, int tdy, Rect srcrc, Rect dstrc, uint color) {
//Log.v("drawColorAndGlyphRect tx=", textureId, " src=", srcrc, " dst=", dstrc); //Log.v("drawColorAndGlyphRect tx=", texture.ID, " src=", srcrc, " dst=", dstrc);
drawColorAndTextureGlyphRect(textureId, tdx, tdy, srcrc.left, srcrc.top, srcrc.width(), srcrc.height(), dstrc.left, dstrc.top, dstrc.width(), dstrc.height(), color); drawColorAndTextureGlyphRect(texture, tdx, tdy, srcrc.left, srcrc.top, srcrc.width(), srcrc.height(), dstrc.left, dstrc.top, dstrc.width(), dstrc.height(), color);
} }
void drawColorAndTextureGlyphRect(uint textureId, int tdx, int tdy, int srcx, int srcy, int srcdx, int srcdy, int xx, int yy, int dx, int dy, uint color) { void drawColorAndTextureGlyphRect(Tex2D texture, int tdx, int tdy, int srcx, int srcy, int srcdx, int srcdy, int xx, int yy, int dx, int dy, uint color) {
float[6*4] colors; float[6*4] colors;
LVGLFillColor(color, colors.ptr, 6); LVGLFillColor(color, colors.ptr, 6);
float dstx0 = cast(float)xx; float dstx0 = cast(float)xx;
@ -848,16 +836,9 @@ class GLSupport {
if (_legacyMode) { if (_legacyMode) {
bool linear = dx != srcdx || dy != srcdy; bool linear = dx != srcdx || dy != srcdy;
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glActiveTexture(GL_TEXTURE0);
checkError("glActiveTexture");
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
checkError("glEnable(GL_TEXTURE_2D)"); texture.setup();
glBindTexture(GL_TEXTURE_2D, textureId); texture.setSamplerParams(linear);
checkError("glBindTexture");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glColor4f(1,1,1,1); glColor4f(1,1,1,1);
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
@ -889,17 +870,17 @@ class GLSupport {
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} else { } else {
_fontProgram.execute(vertices, texcoords, colors, textureId, false); _fontProgram.execute(vertices, texcoords, colors, texture, false);
} }
//drawColorAndTextureRect(vertices, texcoords, colors, textureId, linear); //drawColorAndTextureRect(vertices, texcoords, colors, texture, linear);
} }
void drawColorAndTextureRect(uint textureId, int tdx, int tdy, Rect srcrc, Rect dstrc, uint color, bool linear) { void drawColorAndTextureRect(Tex2D texture, int tdx, int tdy, Rect srcrc, Rect dstrc, uint color, bool linear) {
//Log.v("drawColorAndTextureRect tx=", textureId, " src=", srcrc, " dst=", dstrc); //Log.v("drawColorAndTextureRect tx=", texture.ID, " src=", srcrc, " dst=", dstrc);
drawColorAndTextureRect(textureId, tdx, tdy, srcrc.left, srcrc.top, srcrc.width(), srcrc.height(), dstrc.left, dstrc.top, dstrc.width(), dstrc.height(), color, linear); drawColorAndTextureRect(texture, tdx, tdy, srcrc.left, srcrc.top, srcrc.width(), srcrc.height(), dstrc.left, dstrc.top, dstrc.width(), dstrc.height(), color, linear);
} }
void drawColorAndTextureRect(uint textureId, int tdx, int tdy, int srcx, int srcy, int srcdx, int srcdy, int xx, int yy, int dx, int dy, uint color, bool linear) { void drawColorAndTextureRect(Tex2D texture, int tdx, int tdy, int srcx, int srcy, int srcdx, int srcdy, int xx, int yy, int dx, int dy, uint color, bool linear) {
float[6*4] colors; float[6*4] colors;
LVGLFillColor(color, colors.ptr, 6); LVGLFillColor(color, colors.ptr, 6);
float dstx0 = cast(float)xx; float dstx0 = cast(float)xx;
@ -927,16 +908,9 @@ class GLSupport {
if (_legacyMode) { if (_legacyMode) {
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glActiveTexture(GL_TEXTURE0);
checkError("glActiveTexture");
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
checkError("glEnable(GL_TEXTURE_2D)"); texture.setup();
glBindTexture(GL_TEXTURE_2D, textureId); texture.setSamplerParams(linear);
checkError("glBindTexture");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, linear ? GL_LINEAR : GL_NEAREST);
checkError("drawColorAndTextureRect - glTexParameteri");
glColor4f(1,1,1,1); glColor4f(1,1,1,1);
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
@ -968,30 +942,9 @@ class GLSupport {
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} else { } else {
_textureProgram.execute(vertices, texcoords, colors, textureId, linear); _textureProgram.execute(vertices, texcoords, colors, texture, linear);
} }
//drawColorAndTextureRect(vertices, texcoords, colors, textureId, linear); //drawColorAndTextureRect(vertices, texcoords, colors, texture, linear);
}
/// generate new texture ID
uint genTexture() {
GLuint textureId = 0;
glGenTextures(1, &textureId);
return textureId;
}
/// delete OpenGL texture
void deleteTexture(ref uint textureId) {
if (!textureId)
return;
if (glIsTexture(textureId) != GL_TRUE) {
Log.e("Invalid texture ", textureId);
return;
}
GLuint id = textureId;
glDeleteTextures(1, &id);
checkError("glDeleteTextures");
textureId = 0;
} }
/// call glFlush /// call glFlush
@ -1000,32 +953,16 @@ class GLSupport {
checkError("glFlush"); checkError("glFlush");
} }
bool setTextureImage(uint textureId, int dx, int dy, ubyte * pixels) { bool setTextureImage(Tex2D texture, int dx, int dy, ubyte * pixels) {
//checkError("before setTextureImage"); //checkError("before setTextureImage");
glActiveTexture(GL_TEXTURE0); texture.setup();
checkError("updateTexture - glActiveTexture");
glBindTexture(GL_TEXTURE_2D, 0);
checkError("updateTexture - glBindTexture(0)");
glBindTexture(GL_TEXTURE_2D, textureId);
checkError("updateTexture - glBindTexture");
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
checkError("updateTexture - glPixelStorei"); checkError("updateTexture - glPixelStorei");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); texture.setSamplerParams(true, true);
checkError("updateTexture - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
checkError("updateTexture - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
checkError("updateTexture - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
checkError("updateTexture - glTexParameteri");
if (!glIsTexture(textureId))
Log.e("second test - invalid texture passed to CRGLSupportImpl::setTextureImage");
// ORIGINAL: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dx, dy, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); // ORIGINAL: glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dx, dy, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dx, dy, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dx, dy, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
checkError("updateTexture - glTexImage2D"); if (checkError("updateTexture - glTexImage2D")) {
if (glGetError() != GL_NO_ERROR) {
Log.e("Cannot set image for texture"); Log.e("Cannot set image for texture");
return false; return false;
} }
@ -1033,36 +970,19 @@ class GLSupport {
return true; return true;
} }
bool setTextureImageAlpha(uint textureId, int dx, int dy, ubyte * pixels) { bool setTextureImageAlpha(Tex2D texture, int dx, int dy, ubyte * pixels) {
checkError("before setTextureImageAlpha"); checkError("before setTextureImageAlpha");
glActiveTexture(GL_TEXTURE0); texture.setup();
checkError("updateTexture - glActiveTexture");
glBindTexture(GL_TEXTURE_2D, 0);
checkError("updateTexture - glBindTexture(0)");
glBindTexture(GL_TEXTURE_2D, textureId);
checkError("setTextureImageAlpha - glBindTexture");
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
checkError("setTextureImageAlpha - glPixelStorei"); checkError("setTextureImageAlpha - glPixelStorei");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); texture.setSamplerParams(true, true);
checkError("setTextureImageAlpha - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
checkError("setTextureImageAlpha - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
checkError("setTextureImageAlpha - glTexParameteri");
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
checkError("setTextureImageAlpha - glTexParameteri");
if (!glIsTexture(textureId))
Log.e("second test: invalid texture passed to CRGLSupportImpl::setTextureImageAlpha");
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, dx, dy, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels); glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, dx, dy, 0, GL_ALPHA, GL_UNSIGNED_BYTE, pixels);
checkError("setTextureImageAlpha - glTexImage2D"); if (checkError("setTextureImageAlpha - glTexImage2D")) {
if (glGetError() != GL_NO_ERROR) {
Log.e("Cannot set image for texture"); Log.e("Cannot set image for texture");
return false; return false;
} }
glBindTexture(GL_TEXTURE_2D, 0); texture.unbind();
checkError("updateTexture - glBindTexture(0)");
checkError("after setTextureImageAlpha"); checkError("after setTextureImageAlpha");
return true; return true;
} }