blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Python API: allow passing integer to some BGL functions instead of bgl.Buffer 

These parameters can be both pointers and offsets into a bound buffer, so we
need to support both even if it's possible to cause crashes this way.
This commit is contained in:
Brecht Van Lommel 2019-04-18 11:24:39 +02:00
parent 713f961727
commit 5cfeba72f1
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/python/generic/bgl.c
View File

@ -130,10 +130,17 @@
# define GLclampfP_def(number) Buffer *bgl_buffer##number
#endif
typedef struct BufferOrOffset {
Buffer *buffer;
void *offset;
} BufferOrOffset;
#define GLvoidP_str "O&"
#define GLvoidP_var(number) ((bgl_buffer##number) ? (bgl_buffer##number)->buf.asvoid : NULL)
#define GLvoidP_ref(number) BGL_BufferOrNoneConverter, &bgl_buffer##number
#define GLvoidP_def(number) Buffer *bgl_buffer##number
#define GLvoidP_var(number) \
((bgl_buffer##number.buffer) ? (bgl_buffer##number.buffer)->buf.asvoid : \
(bgl_buffer##number.offset))
#define GLvoidP_ref(number) BGL_BufferOrOffsetConverter, &bgl_buffer##number
#define GLvoidP_def(number) BufferOrOffset bgl_buffer##number
#define GLsizeiP_str "O!"
#define GLsizeiP_var(number) (bgl_buffer##number)->buf.asvoid
@ -688,15 +695,29 @@ Buffer *BGL_MakeBuffer(int type, int ndimensions, int *dimensions, void *initbuf
return buffer;
}
/* Custom converter function so we can support a buffer or NULL. */
static int BGL_BufferOrNoneConverter(PyObject *object, Buffer **buffer)
/* Custom converter function so we can support a buffer, an integer or NULL.
* Many OpenGL API functions can accept both an actual pointer or an offset
* into a buffer that is already bound. */
static int BGL_BufferOrOffsetConverter(PyObject *object, BufferOrOffset *buffer)
{
if (object == Py_None) {
*buffer = NULL;
buffer->buffer = NULL;
buffer->offset = NULL;
return 1;
}
else if (PyNumber_Check(object)) {
Py_ssize_t offset = PyNumber_AsSsize_t(object, PyExc_IndexError);
if (offset == -1 && PyErr_Occurred()) {
return 0;
}
buffer->buffer = NULL;
buffer->offset = (void *)offset;
return 1;
}
else if (PyObject_TypeCheck(object, &BGL_bufferType)) {
*buffer = (Buffer *)object;
buffer->buffer = (Buffer *)object;
buffer->offset = NULL;
return 1;
}
else {