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

optimize OpenGL backend -- use batch drawing; close #271

This commit is contained in:
Vadim Lopatin 2016-07-01 14:54:58 +03:00
parent fef5858955
commit 20f3f26ea1
2 changed files with 112 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ class GLDrawBuf : DrawBuf, GLConfigCallback {
override void afterDrawing() { override void afterDrawing() {
glSupport.setOrthoProjection(Rect(0, 0, _dx, _dy), Rect(0, 0, _dx, _dy)); glSupport.setOrthoProjection(Rect(0, 0, _dx, _dy), Rect(0, 0, _dx, _dy));
_scene.draw(); _scene.draw();
glSupport.batch.flush();
GLProgram.unbind(); GLProgram.unbind();
glSupport.destroyBuffers(); glSupport.destroyBuffers();
glSupport.flushGL(); glSupport.flushGL();
@ -569,7 +570,8 @@ private class GLImageCache : GLCache
dstrc.bottom -= clip.bottom; dstrc.bottom -= clip.bottom;
} }
if (!dstrc.empty) if (!dstrc.empty)
glSupport.drawColorAndTextureRects(_texture, _tdx, _tdy, [srcrc], [dstrc], [color, color, color, color], srcrc.width() != dstrc.width() || srcrc.height() != dstrc.height()); glSupport.batch.addTexturedRect(_texture, _tdx, _tdy, color, color, color, color, srcrc, dstrc, srcrc.width() != dstrc.width() || srcrc.height() != dstrc.height());
//glSupport.drawColorAndTextureRects(_texture, _tdx, _tdy, [srcrc], [dstrc], [color, color, color, color], srcrc.width() != dstrc.width() || srcrc.height() != dstrc.height());
//drawColorAndTextureRect(vertices, texcoords, color, _texture); //drawColorAndTextureRect(vertices, texcoords, color, _texture);
if (rotationAngle) { if (rotationAngle) {
@ -665,7 +667,8 @@ private class GLGlyphCache : GLCache
if (!dstrc.empty) { if (!dstrc.empty) {
//Log.d("drawing glyph with color ", color); //Log.d("drawing glyph with color ", color);
//glSupport.drawColorAndTextureRect(_texture, _tdx, _tdy, srcrc, dstrc, color, false); //glSupport.drawColorAndTextureRect(_texture, _tdx, _tdy, srcrc, dstrc, color, false);
glSupport.drawColorAndTextureRects(_texture, _tdx, _tdy, [srcrc], [dstrc], [color, color, color, color], false); //glSupport.drawColorAndTextureRects(_texture, _tdx, _tdy, [srcrc], [dstrc], [color, color, color, color], false);
glSupport.batch.addTexturedRect(_texture, _tdx, _tdy, color, color, color, color, srcrc, dstrc, false);
} }
} }
} }
@ -713,7 +716,8 @@ public:
_color = color; _color = color;
} }
override void draw() { override void draw() {
glSupport.drawLines([Rect(_p1, _p2)], [_color, _color]); //glSupport.drawLines([Rect(_p1, _p2)], [_color, _color]);
glSupport.batch.addLine(Rect(_p1, _p2), _color, _color);
} }
} }
@ -728,7 +732,8 @@ public:
_color = color; _color = color;
} }
override void draw() { override void draw() {
glSupport.drawSolidFillRects([_rc], [_color, _color, _color, _color]); glSupport.batch.addSolidRect(_rc, _color);
//glSupport.drawSolidFillRects([_rc], [_color, _color, _color, _color]);
} }
} }
@ -751,7 +756,8 @@ public:
for (int x = _rc.left; x < _rc.right; x++) for (int x = _rc.left; x < _rc.right; x++)
if ((x ^ y) & 1) { if ((x ^ y) & 1) {
//glSupport.drawSolidFillRect(Rect(x, y, x + 1, y + 1), _color, _color, _color, _color); //glSupport.drawSolidFillRect(Rect(x, y, x + 1, y + 1), _color, _color, _color, _color);
glSupport.drawSolidFillRects([Rect(x, y, x + 1, y + 1)], [_color, _color, _color, _color]); //glSupport.drawSolidFillRects([Rect(x, y, x + 1, y + 1)], [_color, _color, _color, _color]);
glSupport.batch.addSolidRect(Rect(x, y, x + 1, y + 1), _color);
} }
} }
} }

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

@ -499,19 +499,22 @@ class SolidFillProgram : GLProgram {
VAO vao; VAO vao;
VBO vbo; VBO vbo;
EBO ebo; EBO ebo;
bool needToCreateVAO = true;
protected void createVAO(float[] vertices, float[] colors) { protected void createVAO(float[] vertices, float[] colors) {
if (!vao) {
vao = new VAO; vao = new VAO;
vbo = new VBO; vbo = new VBO;
ebo = new EBO; ebo = new EBO;
}
vbo.bind();
ebo.bind();
vao.bind();
glVertexAttribPointer(vertexLocation, 3, GL_FLOAT, GL_FALSE, 0, cast(void*) 0); glVertexAttribPointer(vertexLocation, 3, GL_FLOAT, GL_FALSE, 0, cast(void*) 0);
glVertexAttribPointer(colAttrLocation, 4, GL_FLOAT, GL_FALSE, 0, cast(void*) (vertices.length * float.sizeof)); glVertexAttribPointer(colAttrLocation, 4, GL_FLOAT, GL_FALSE, 0, cast(void*) (vertices.length * float.sizeof));
glEnableVertexAttribArray(vertexLocation); glEnableVertexAttribArray(vertexLocation);
glEnableVertexAttribArray(colAttrLocation); glEnableVertexAttribArray(colAttrLocation);
needToCreateVAO = false;
} }
protected void beforeExecute() { protected void beforeExecute() {
@ -523,31 +526,26 @@ class SolidFillProgram : GLProgram {
//checkgl!glUniformMatrix4fv(matrixLocation, 1, false, glSupport.projectionMatrix.m.ptr); //checkgl!glUniformMatrix4fv(matrixLocation, 1, false, glSupport.projectionMatrix.m.ptr);
} }
bool execute(float[] vertices, float[] colors, int[] indexes = null) { bool execute(float[] vertices, float[] colors, int[] indexes) {
if(!check()) if(!check())
return false; return false;
beforeExecute(); beforeExecute();
if(needToCreateVAO)
createVAO(vertices, colors); createVAO(vertices, colors);
vbo.bind(); vbo.bind();
vbo.fill([vertices, colors]); vbo.fill([vertices, colors]);
if (indexes) {
ebo.bind(); ebo.bind();
ebo.fill(indexes); ebo.fill(indexes);
}
vao.bind(); vao.bind();
if (indexes) { checkgl!glDrawElements(GL_TRIANGLES, cast(int)indexes.length, GL_UNSIGNED_INT, cast(void*)null);
checkgl!glDrawElements(GL_TRIANGLES, indexes.length, GL_UNSIGNED_INT, cast(void*)null);
} else {
checkgl!glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
}
//if (indexes)
// ebo.unbind();
vao.unbind(); vao.unbind();
vbo.unbind();
ebo.unbind();
return true; return true;
} }
@ -558,36 +556,29 @@ class SolidFillProgram : GLProgram {
vao = null; vao = null;
vbo = null; vbo = null;
ebo = null; ebo = null;
needToCreateVAO = true;
} }
} }
class LineProgram : SolidFillProgram { class LineProgram : SolidFillProgram {
override bool execute(float[] vertices, float[] colors, int[] indexes = null) { override bool execute(float[] vertices, float[] colors, int[] indexes) {
if(!check()) if(!check())
return false; return false;
beforeExecute(); beforeExecute();
if(needToCreateVAO)
createVAO(vertices, colors); createVAO(vertices, colors);
vbo.bind(); vbo.bind();
vbo.fill([vertices, colors]); vbo.fill([vertices, colors]);
if (indexes) {
ebo.bind(); ebo.bind();
ebo.fill(indexes); ebo.fill(indexes);
}
vao.bind(); vao.bind();
if (indexes) { checkgl!glDrawElements(GL_LINES, cast(int)indexes.length, GL_UNSIGNED_INT, cast(void*)null);
checkgl!glDrawElements(GL_LINES, indexes.length, GL_UNSIGNED_INT, cast(void*)null);
} else {
checkgl!glDrawArrays(GL_LINES, 0, 2);
}
if (indexes)
ebo.unbind();
vao.unbind(); vao.unbind();
vbo.unbind();
ebo.unbind();
return true; return true;
} }
} }
@ -639,9 +630,14 @@ class TextureProgram : SolidFillProgram {
} }
protected void createVAO(float[] vertices, float[] colors, float[] texcoords) { protected void createVAO(float[] vertices, float[] colors, float[] texcoords) {
if (!vao) {
vao = new VAO; vao = new VAO;
vbo = new VBO; vbo = new VBO;
ebo = new EBO; ebo = new EBO;
}
vbo.bind();
ebo.bind();
vao.bind();
glVertexAttribPointer(vertexLocation, 3, GL_FLOAT, GL_FALSE, 0, cast(void*) 0); glVertexAttribPointer(vertexLocation, 3, GL_FLOAT, GL_FALSE, 0, cast(void*) 0);
glVertexAttribPointer(colAttrLocation, 4, GL_FLOAT, GL_FALSE, 0, cast(void*) (vertices.length * float.sizeof)); glVertexAttribPointer(colAttrLocation, 4, GL_FLOAT, GL_FALSE, 0, cast(void*) (vertices.length * float.sizeof));
@ -650,11 +646,9 @@ class TextureProgram : SolidFillProgram {
glEnableVertexAttribArray(vertexLocation); glEnableVertexAttribArray(vertexLocation);
glEnableVertexAttribArray(colAttrLocation); glEnableVertexAttribArray(colAttrLocation);
glEnableVertexAttribArray(texCoordLocation); glEnableVertexAttribArray(texCoordLocation);
needToCreateVAO = false;
} }
bool execute(float[] vertices, float[] colors, float[] texcoords, Tex2D texture, bool linear, int[] indexes = null) { bool execute(float[] vertices, float[] colors, float[] texcoords, Tex2D texture, bool linear, int[] indexes) {
if(!check()) if(!check())
return false; return false;
beforeExecute(); beforeExecute();
@ -662,28 +656,21 @@ class TextureProgram : SolidFillProgram {
texture.setup(); texture.setup();
texture.setSamplerParams(linear); texture.setSamplerParams(linear);
if(needToCreateVAO)
createVAO(vertices, colors, texcoords); createVAO(vertices, colors, texcoords);
vbo.bind(); vbo.bind();
vbo.fill([vertices, colors, texcoords]); vbo.fill([vertices, colors, texcoords]);
if (indexes) {
ebo.bind(); ebo.bind();
ebo.fill(indexes); ebo.fill(indexes);
}
vao.bind(); vao.bind();
if (indexes) { checkgl!glDrawElements(GL_TRIANGLES, cast(int)indexes.length, GL_UNSIGNED_INT, cast(void*)null);
checkgl!glDrawElements(GL_TRIANGLES, indexes.length, GL_UNSIGNED_INT, cast(void*)null);
} else {
checkgl!glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
}
//if (indexes)
// ebo.unbind();
vao.unbind(); vao.unbind();
vbo.unbind();
ebo.unbind();
texture.unbind(); texture.unbind();
return true; return true;
@ -967,12 +954,12 @@ final class GLSupport {
int[] indexes; int[] indexes;
indexes.assumeSafeAppend(); indexes.assumeSafeAppend();
for (uint i = 0; i < rectCount; i++) { for (uint i = 0; i < rectCount; i++) {
indexes ~= i * 6 + 0; indexes ~= i * 4 + 0;
indexes ~= i * 6 + 1; indexes ~= i * 4 + 1;
indexes ~= i * 6 + 2; indexes ~= i * 4 + 2;
indexes ~= i * 6 + 1; indexes ~= i * 4 + 1;
indexes ~= i * 6 + 2; indexes ~= i * 4 + 2;
indexes ~= i * 6 + 3; indexes ~= i * 4 + 3;
} }
return indexes; return indexes;
} }
@ -989,10 +976,8 @@ final class GLSupport {
} }
void drawSolidFillRects(Rect[] rects, uint[] vertexColors) { void drawSolidFillRects(Rect[] rects, uint[] vertexColors) {
Color[] colors; //Log.v("drawSolidFillRects rects:", rects.length, " colors:", vertexColors.length);
colors.length = vertexColors.length; float[] colors = convertColors(vertexColors);
for (uint i = 0; i < vertexColors.length; i++)
FillColor(vertexColors[i], colors[i .. i + 1]);
float[] vertexArray; float[] vertexArray;
vertexArray.assumeSafeAppend(); vertexArray.assumeSafeAppend();
@ -1043,17 +1028,32 @@ final class GLSupport {
} }
} else { } else {
if (_solidFillProgram !is null) { if (_solidFillProgram !is null) {
_solidFillProgram.execute(vertexArray, cast(float[])colors, indexes); _solidFillProgram.execute(vertexArray, colors, indexes);
} else } else
Log.e("No program"); Log.e("No program");
} }
} }
float[] convertColors(uint[] cols) {
float[] colors;
colors.assumeSafeAppend();
colors.length = cols.length * 4;
for (uint i = 0; i < cols.length; i++) {
uint color = cols[i];
float r = ((color >> 16) & 255) / 255.0;
float g = ((color >> 8) & 255) / 255.0;
float b = ((color >> 0) & 255) / 255.0;
float a = (((color >> 24) & 255) ^ 255) / 255.0;
colors[i * 4 + 0] = r;
colors[i * 4 + 1] = g;
colors[i * 4 + 2] = b;
colors[i * 4 + 3] = a;
}
return colors;
}
void drawColorAndTextureRects(Tex2D texture, int tdx, int tdy, Rect[] srcRects, Rect[] dstRects, uint[] vertexColors, bool linear) { void drawColorAndTextureRects(Tex2D texture, int tdx, int tdy, Rect[] srcRects, Rect[] dstRects, uint[] vertexColors, bool linear) {
Color[] colors; float[] colors = convertColors(vertexColors);
colors.length = vertexColors.length;
for (uint i = 0; i < vertexColors.length; i++)
FillColor(vertexColors[i], colors[i .. i + 1]);
float[] vertexArray; float[] vertexArray;
vertexArray.assumeSafeAppend(); vertexArray.assumeSafeAppend();
@ -1090,6 +1090,7 @@ final class GLSupport {
} }
int[] indexes = makeRectangleIndexesArray(srcRects.length); int[] indexes = makeRectangleIndexesArray(srcRects.length);
//Log.v("drawColorAndTextureRects srcrects:", srcRects.length, " dstrects:", dstRects.length, " colors:", vertexColors.length, " indexes: ", indexes);
if (_legacyMode) { if (_legacyMode) {
static if (SUPPORT_LEGACY_OPENGL) { static if (SUPPORT_LEGACY_OPENGL) {
@ -1121,7 +1122,7 @@ final class GLSupport {
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }
} else { } else {
_textureProgram.execute(vertexArray, cast(float[])colors, txcoordArray, texture, linear, indexes); _textureProgram.execute(vertexArray, colors, txcoordArray, texture, linear, indexes);
} }
} }
@ -1352,13 +1353,13 @@ class GLObject(GLObjectTypes type, GLuint target = 0) {
int length; int length;
foreach(b; buffs) foreach(b; buffs)
length += b.length; length += b.length;
glBufferData(target, checkgl!glBufferData(target,
length * float.sizeof, length * float.sizeof,
null, null,
GL_STREAM_DRAW); GL_STREAM_DRAW);
int offset; int offset;
foreach(b; buffs) { foreach(b; buffs) {
glBufferSubData(target, checkgl!glBufferSubData(target,
offset, offset,
b.length * float.sizeof, b.length * float.sizeof,
b.ptr); b.ptr);
@ -1368,7 +1369,7 @@ class GLObject(GLObjectTypes type, GLuint target = 0) {
static if (target == GL_ELEMENT_ARRAY_BUFFER) { static if (target == GL_ELEMENT_ARRAY_BUFFER) {
void fill(int[] indexes) { void fill(int[] indexes) {
glBufferData(target, cast(int)(indexes.length * int.sizeof), indexes.ptr, GL_STATIC_DRAW); checkgl!glBufferData(target, cast(int)(indexes.length * int.sizeof), indexes.ptr, GL_STREAM_DRAW);
} }
} }
} }
@ -1639,21 +1640,23 @@ class OpenGLBatch {
return; // nothing to draw return; // nothing to draw
if (_currentTexture) { if (_currentTexture) {
// draw with texture // draw with texture
//Log.v("flush ", _dstRects.length, " texture rectangles");
glSupport.drawColorAndTextureRects(_currentTexture, _currentTextureDx, _currentTextureDy, _srcRects, _dstRects, _colors, _currentTextureLinear); glSupport.drawColorAndTextureRects(_currentTexture, _currentTextureDx, _currentTextureDy, _srcRects, _dstRects, _colors, _currentTextureLinear);
} else { } else {
// draw solid fill // draw solid fill
//Log.v("flush ", _dstRects.length, " solid rectangles");
glSupport.drawSolidFillRects(_dstRects, _colors); glSupport.drawSolidFillRects(_dstRects, _colors);
} }
reset(); reset();
} }
/// add textured rect /// add textured rect
void add(Tex2D texture, int textureDx, int textureDy, uint color1, uint color2, uint color3, uint color4, Rect srcRect, Rect dstRect, bool linear) { void addTexturedRect(Tex2D texture, int textureDx, int textureDy, uint color1, uint color2, uint color3, uint color4, Rect srcRect, Rect dstRect, bool linear) {
if ( ((texture is null) && !(_currentTexture is null)) if (!_currentTexture
|| (!(texture is null) && (_currentTexture is null)) || _currentTexture.ID != texture.ID
|| (!(texture is null) && (_currentTexture is null)) || _currentTextureLinear != linear
|| (!(texture is null) && !(_currentTexture is texture)) //|| (textureDx != _currentTextureDx)
|| (textureDx != _currentTextureDx) //|| (textureDy != _currentTextureDy)
|| (textureDy != _currentTextureDy) //|| true
) )
{ {
flush(); flush();
@ -1672,12 +1675,26 @@ class OpenGLBatch {
_colors ~= color4; _colors ~= color4;
} }
/// add solid rect /// add solid rect
void add(uint color, Rect dstRect) { void addSolidRect(Rect dstRect, uint color) {
add(null, 0, 0, color, color, color, color, Rect(), dstRect, false); addGradientRect(dstRect, color, color, color, color);
} }
/// add gradient rect /// add gradient rect
void add(uint color1, uint color2, uint color3, uint color4, Rect dstRect) { void addGradientRect(Rect dstRect, uint color1, uint color2, uint color3, uint color4) {
add(null, 0, 0, color1, color2, color3, color4, Rect(), dstRect, false); if (_currentTexture)
flush();
_dstRects ~= dstRect;
_colors ~= color1;
_colors ~= color2;
_colors ~= color3;
_colors ~= color4;
}
/// add gradient rect
void addLine(Rect dstRect, uint color1, uint color2) {
flush();
// TODO: batch lines, too
glSupport.drawLines([dstRect], [color1, color2]);
} }
} }