KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid unnecessary reallocs for cell data

Browse Source 
Only re-allocate when the buffer size changes
This commit is contained in:
Kovid Goyal 2017-08-21 14:56:29 +05:30
parent 101a50b0ff
commit 0bbea6812e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kitty/gl.h
View File

@ -563,6 +563,24 @@ NamedBufferData(PyObject UNUSED *self, PyObject *args) {
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyObject*
replace_or_create_buffer(PyObject UNUSED *self, PyObject *args) {
int usage;
unsigned long size, prev_sz, target;
PyObject *address;
if (!PyArg_ParseTuple(args, "kkkO!i", &target, &size, &prev_sz, &PyLong_Type, &address, &usage)) return NULL;
void *data = PyLong_AsVoidPtr(address);
if (data == NULL) { PyErr_SetString(PyExc_TypeError, "Not a valid data pointer"); return NULL; }
glBindBuffer(GL_TEXTURE_BUFFER, target);
Py_BEGIN_ALLOW_THREADS;
if (prev_sz == 0 || prev_sz != size) glBufferData(GL_TEXTURE_BUFFER, size, data, usage);
else glBufferSubData(GL_TEXTURE_BUFFER, 0, size, data);
Py_END_ALLOW_THREADS;
CHECK_ERROR;
glBindBuffer(GL_TEXTURE_BUFFER, 0);
Py_RETURN_NONE;
}
static PyObject* static PyObject*
TexParameteri(PyObject UNUSED *self, PyObject *args) { TexParameteri(PyObject UNUSED *self, PyObject *args) {
int target, name, param; int target, name, param;
@ -717,6 +735,7 @@ int add_module_gl_constants(PyObject *module) {
#define GL_METHODS \ #define GL_METHODS \
{"enable_automatic_opengl_error_checking", (PyCFunction)enable_automatic_error_checking, METH_O, NULL}, \ {"enable_automatic_opengl_error_checking", (PyCFunction)enable_automatic_error_checking, METH_O, NULL}, \
{"copy_image_sub_data", (PyCFunction)copy_image_sub_data, METH_VARARGS, NULL}, \ {"copy_image_sub_data", (PyCFunction)copy_image_sub_data, METH_VARARGS, NULL}, \
{"replace_or_create_buffer", (PyCFunction)replace_or_create_buffer, METH_VARARGS, NULL}, \
{"glewInit", (PyCFunction)_glewInit, METH_NOARGS, NULL}, \ {"glewInit", (PyCFunction)_glewInit, METH_NOARGS, NULL}, \
{"check_for_extensions", (PyCFunction)check_for_extensions, METH_NOARGS, NULL}, \ {"check_for_extensions", (PyCFunction)check_for_extensions, METH_NOARGS, NULL}, \
METH(Viewport, METH_VARARGS) \ METH(Viewport, METH_VARARGS) \

7
kitty/shaders.py
View File

@ -24,7 +24,8 @@ from .fast_data_types import (
GL_TEXTURE_BUFFER, GL_R32UI, GL_FLOAT, GL_ARRAY_BUFFER, glBindBuffer, GL_TEXTURE_BUFFER, GL_R32UI, GL_FLOAT, GL_ARRAY_BUFFER, glBindBuffer,
glPixelStorei, glTexBuffer, glActiveTexture, glTexStorage3D, glPixelStorei, glTexBuffer, glActiveTexture, glTexStorage3D,
glCopyImageSubData, glTexSubImage3D, ITALIC, BOLD, SpriteMap, glCopyImageSubData, glTexSubImage3D, ITALIC, BOLD, SpriteMap,
glEnableVertexAttribArray, glVertexAttribPointer, copy_image_sub_data glEnableVertexAttribArray, glVertexAttribPointer, copy_image_sub_data,
replace_or_create_buffer
) )
from .utils import safe_print from .utils import safe_print
@ -42,6 +43,7 @@ class Sprites:
# extensions one they become available. # extensions one they become available.
def __init__(self): def __init__(self):
self.prev_sprite_map_sz = 0
self.xnum = self.ynum = 1 self.xnum = self.ynum = 1
self.sampler_num = 0 self.sampler_num = 0
self.buffer_sampler_num = 1 self.buffer_sampler_num = 1
@ -157,8 +159,9 @@ class Sprites:
return glGenBuffers(1) return glGenBuffers(1)
def set_sprite_map(self, buf_id, data, usage=GL_STREAM_DRAW): def set_sprite_map(self, buf_id, data, usage=GL_STREAM_DRAW):
prev_sz, self.prev_sprite_map_sz = self.prev_sprite_map_sz, sizeof(data)
replace_or_create_buffer(buf_id, self.prev_sprite_map_sz, prev_sz, addressof(data), usage)
self.bind_sprite_map(buf_id) self.bind_sprite_map(buf_id)
glNamedBufferData(buf_id, sizeof(data), addressof(data), usage)
def bind_sprite_map(self, buf_id): def bind_sprite_map(self, buf_id):
glBindBuffer(GL_TEXTURE_BUFFER, buf_id) glBindBuffer(GL_TEXTURE_BUFFER, buf_id)