diff options
author | mano-wii <germano.costa@ig.com.br> | 2018-09-06 03:10:42 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2018-09-06 03:15:44 +0300 |
commit | 6d04e48539ce50f0de9cc73a36e7733aee608773 (patch) | |
tree | ff2784a4b1e31773610fedc78a3efda625a23bc6 /source/blender/python/gpu/gpu_py_types.c | |
parent | b0602483249d1184f2672cd5d5578955560335b5 (diff) |
Join the python modules `gpu` and `_gpu` into one.
Maybe it's still early to set the new drawing api for python.
But joining these two modules is an initial step.
```
>>> gpu.
matrix
select
types
```
```
>>> gpu.types.GPU
Batch(
OffScreen(
VertBuf(
VertFormat(
```
The creation of a new offscreen object is now done by the `GPUOffscreen.__new__` method.
Reviewers: campbellbarton, dfelinto
Reviewed By: campbellbarton, dfelinto
Tags: #bf_blender_2.8
Differential Revision: https://developer.blender.org/D3667
Diffstat (limited to 'source/blender/python/gpu/gpu_py_types.c')
-rw-r--r-- | source/blender/python/gpu/gpu_py_types.c | 785 |
1 files changed, 7 insertions, 778 deletions
diff --git a/source/blender/python/gpu/gpu_py_types.c b/source/blender/python/gpu/gpu_py_types.c index 4e564fdf849..62694189ce3 100644 --- a/source/blender/python/gpu/gpu_py_types.c +++ b/source/blender/python/gpu/gpu_py_types.c @@ -19,7 +19,7 @@ */ /** \file blender/python/gpu/gpu_py_types.c - * \ingroup pygpu + * \ingroup bpygpu * * - Use ``bpygpu_`` for local API. * - Use ``BPyGPU`` for public API. @@ -27,751 +27,27 @@ #include <Python.h> -#include "GPU_batch.h" -#include "GPU_vertex_format.h" - -#include "BLI_math.h" - -#include "MEM_guardedalloc.h" - #include "../generic/py_capi_utils.h" #include "../generic/python_utildefines.h" #include "gpu_py_types.h" /* own include */ -#ifdef __BIG_ENDIAN__ - /* big endian */ -# define MAKE_ID2(c, d) ((c) << 8 | (d)) -# define MAKE_ID3(a, b, c) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 ) -# define MAKE_ID4(a, b, c, d) ( (int)(a) << 24 | (int)(b) << 16 | (c) << 8 | (d) ) -#else - /* little endian */ -# define MAKE_ID2(c, d) ((d) << 8 | (c)) -# define MAKE_ID3(a, b, c) ( (int)(c) << 16 | (b) << 8 | (a) ) -# define MAKE_ID4(a, b, c, d) ( (int)(d) << 24 | (int)(c) << 16 | (b) << 8 | (a) ) -#endif - -/* -------------------------------------------------------------------- */ - -/** \name Enum Conversion - * - * Use with PyArg_ParseTuple's "O&" formatting. - * \{ */ - -static int bpygpu_ParseVertCompType(PyObject *o, void *p) -{ - Py_ssize_t comp_type_id_len; - const char *comp_type_id = _PyUnicode_AsStringAndSize(o, &comp_type_id_len); - if (comp_type_id == NULL) { - PyErr_Format(PyExc_ValueError, - "expected a string, got %s", - Py_TYPE(o)->tp_name); - return 0; - } - - GPUVertCompType comp_type; - if (comp_type_id_len == 2) { - switch (*((ushort *)comp_type_id)) { - case MAKE_ID2('I', '8'): { comp_type = GPU_COMP_I8; goto success; } - case MAKE_ID2('U', '8'): { comp_type = GPU_COMP_U8; goto success; } - } - } - else if (comp_type_id_len == 3) { - switch (*((uint *)comp_type_id)) { - case MAKE_ID3('I', '1', '6'): { comp_type = GPU_COMP_I16; goto success; } - case MAKE_ID3('U', '1', '6'): { comp_type = GPU_COMP_U16; goto success; } - case MAKE_ID3('I', '3', '2'): { comp_type = GPU_COMP_I32; goto success; } - case MAKE_ID3('U', '3', '2'): { comp_type = GPU_COMP_U32; goto success; } - case MAKE_ID3('F', '3', '2'): { comp_type = GPU_COMP_F32; goto success; } - case MAKE_ID3('I', '1', '0'): { comp_type = GPU_COMP_I10; goto success; } - } - } - - PyErr_Format(PyExc_ValueError, - "unknown type literal: '%s'", - comp_type_id); - return 0; - -success: - *((GPUVertCompType *)p) = comp_type; - return 1; -} - -static int bpygpu_ParseVertFetchMode(PyObject *o, void *p) -{ - Py_ssize_t mode_id_len; - const char *mode_id = _PyUnicode_AsStringAndSize(o, &mode_id_len); - if (mode_id == NULL) { - PyErr_Format(PyExc_ValueError, - "expected a string, got %s", - Py_TYPE(o)->tp_name); - return 0; - } -#define MATCH_ID(id) \ - if (mode_id_len == strlen(STRINGIFY(id))) { \ - if (STREQ(mode_id, STRINGIFY(id))) { \ - mode = GPU_FETCH_##id; \ - goto success; \ - } \ - } ((void)0) - - GPUVertFetchMode mode; - MATCH_ID(FLOAT); - MATCH_ID(INT); - MATCH_ID(INT_TO_FLOAT_UNIT); - MATCH_ID(INT_TO_FLOAT); -#undef MATCH_ID - PyErr_Format(PyExc_ValueError, - "unknown type literal: '%s'", - mode_id); - return 0; - -success: - (*(GPUVertFetchMode *)p) = mode; - return 1; -} - -static int bpygpu_ParsePrimType(PyObject *o, void *p) -{ - Py_ssize_t mode_id_len; - const char *mode_id = _PyUnicode_AsStringAndSize(o, &mode_id_len); - if (mode_id == NULL) { - PyErr_Format(PyExc_ValueError, - "expected a string, got %s", - Py_TYPE(o)->tp_name); - return 0; - } -#define MATCH_ID(id) \ - if (mode_id_len == strlen(STRINGIFY(id))) { \ - if (STREQ(mode_id, STRINGIFY(id))) { \ - mode = GPU_PRIM_##id; \ - goto success; \ - } \ - } ((void)0) - - GPUPrimType mode; - MATCH_ID(POINTS); - MATCH_ID(LINES); - MATCH_ID(TRIS); - MATCH_ID(LINE_STRIP); - MATCH_ID(LINE_LOOP); - MATCH_ID(TRI_STRIP); - MATCH_ID(TRI_FAN); - MATCH_ID(LINE_STRIP_ADJ); - -#undef MATCH_ID - PyErr_Format(PyExc_ValueError, - "unknown type literal: '%s'", - mode_id); - return 0; - -success: - (*(GPUPrimType *)p) = mode; - return 1; -} - -/** \} */ - - -/* -------------------------------------------------------------------- */ - -/** \name Utility Functions - * \{ */ - -#define PY_AS_NATIVE_SWITCH(attr) \ - switch (attr->comp_type) { \ - case GPU_COMP_I8: { PY_AS_NATIVE(int8_t, PyC_Long_AsI8); break; } \ - case GPU_COMP_U8: { PY_AS_NATIVE(uint8_t, PyC_Long_AsU8); break; } \ - case GPU_COMP_I16: { PY_AS_NATIVE(int16_t, PyC_Long_AsI16); break; } \ - case GPU_COMP_U16: { PY_AS_NATIVE(uint16_t, PyC_Long_AsU16); break; } \ - case GPU_COMP_I32: { PY_AS_NATIVE(int32_t, PyC_Long_AsI32); break; } \ - case GPU_COMP_U32: { PY_AS_NATIVE(uint32_t, PyC_Long_AsU32); break; } \ - case GPU_COMP_F32: { PY_AS_NATIVE(float, PyFloat_AsDouble); break; } \ - default: \ - BLI_assert(0); \ - } ((void)0) - -/* No error checking, callers must run PyErr_Occurred */ -static void fill_format_elem(void *data_dst_void, PyObject *py_src, const GPUVertAttr *attr) -{ -#define PY_AS_NATIVE(ty_dst, py_as_native) \ -{ \ - ty_dst *data_dst = data_dst_void; \ - *data_dst = py_as_native(py_src); \ -} ((void)0) - - PY_AS_NATIVE_SWITCH(attr); - -#undef PY_AS_NATIVE -} - -/* No error checking, callers must run PyErr_Occurred */ -static void fill_format_tuple(void *data_dst_void, PyObject *py_src, const GPUVertAttr *attr) -{ - const uint len = attr->comp_len; - -/** - * Args are constants, so range checks will be optimized out if they're nop's. - */ -#define PY_AS_NATIVE(ty_dst, py_as_native) \ - ty_dst *data_dst = data_dst_void; \ - for (uint i = 0; i < len; i++) { \ - data_dst[i] = py_as_native(PyTuple_GET_ITEM(py_src, i)); \ - } ((void)0) - - PY_AS_NATIVE_SWITCH(attr); - -#undef PY_AS_NATIVE -} - -#undef PY_AS_NATIVE_SWITCH -#undef WARN_TYPE_LIMIT_PUSH -#undef WARN_TYPE_LIMIT_POP - -static bool bpygpu_vertbuf_fill_impl( - GPUVertBuf *vbo, - uint data_id, PyObject *seq) -{ - bool ok = true; - const GPUVertAttr *attr = &vbo->format.attribs[data_id]; - - GPUVertBufRaw data_step; - GPU_vertbuf_attr_get_raw_data(vbo, data_id, &data_step); - - PyObject *seq_fast = PySequence_Fast(seq, "Vertex buffer fill"); - if (seq_fast == NULL) { - goto finally; - } - - const uint seq_len = PySequence_Fast_GET_SIZE(seq_fast); - - if (seq_len != vbo->vertex_len) { - PyErr_Format(PyExc_ValueError, - "Expected a sequence of size %d, got %d", - vbo->vertex_len, seq_len); - } - - PyObject **seq_items = PySequence_Fast_ITEMS(seq_fast); - - if (attr->comp_len == 1) { - for (uint i = 0; i < seq_len; i++) { - uchar *data = (uchar *)GPU_vertbuf_raw_step(&data_step); - PyObject *item = seq_items[i]; - fill_format_elem(data, item, attr); - } - } - else { - for (uint i = 0; i < seq_len; i++) { - uchar *data = (uchar *)GPU_vertbuf_raw_step(&data_step); - PyObject *item = seq_items[i]; - if (!PyTuple_CheckExact(item)) { - PyErr_Format(PyExc_ValueError, - "expected a tuple, got %s", - Py_TYPE(item)->tp_name); - ok = false; - goto finally; - } - if (PyTuple_GET_SIZE(item) != attr->comp_len) { - PyErr_Format(PyExc_ValueError, - "expected a tuple of size %d, got %d", - attr->comp_len, PyTuple_GET_SIZE(item)); - ok = false; - goto finally; - } - - /* May trigger error, check below */ - fill_format_tuple(data, item, attr); - } - } - - if (PyErr_Occurred()) { - ok = false; - } - -finally: - - Py_DECREF(seq_fast); - return ok; -} - -/* handy, but not used just now */ -#if 0 -static int bpygpu_find_id(const GPUVertFormat *fmt, const char *id) -{ - for (int i = 0; i < fmt->attr_len; i++) { - for (uint j = 0; j < fmt->name_len; j++) { - if (STREQ(fmt->attribs[i].name[j], id)) { - return i; - } - } - } - return -1; -} -#endif - -/** \} */ - - -/* -------------------------------------------------------------------- */ - -/** \name VertFormat Type - * \{ */ - -static PyObject *bpygpu_VertFormat_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds) -{ - if (PyTuple_GET_SIZE(args) || (kwds && PyDict_Size(kwds))) { - PyErr_SetString(PyExc_TypeError, - "VertFormat(): takes no arguments"); - return NULL; - } - - BPyGPUVertFormat *ret = (BPyGPUVertFormat *)BPyGPUVertFormat_CreatePyObject(NULL); - - return (PyObject *)ret; -} - -PyDoc_STRVAR(bpygpu_VertFormat_attr_add_doc, -"TODO" -); -static PyObject *bpygpu_VertFormat_attr_add(BPyGPUVertFormat *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"id", "comp_type", "len", "fetch_mode", NULL}; - - struct { - const char *id; - GPUVertCompType comp_type; - uint len; - GPUVertFetchMode fetch_mode; - } params; - - if (self->fmt.attr_len == GPU_VERT_ATTR_MAX_LEN) { - PyErr_SetString(PyExc_ValueError, "Maxumum attr reached " STRINGIFY(GPU_VERT_ATTR_MAX_LEN)); - return NULL; - } - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, "$sO&IO&:attr_add", (char **)kwlist, - ¶ms.id, - bpygpu_ParseVertCompType, ¶ms.comp_type, - ¶ms.len, - bpygpu_ParseVertFetchMode, ¶ms.fetch_mode)) - { - return NULL; - } - - uint attr_id = GPU_vertformat_attr_add(&self->fmt, params.id, params.comp_type, params.len, params.fetch_mode); - return PyLong_FromLong(attr_id); -} - -static struct PyMethodDef bpygpu_VertFormat_methods[] = { - {"attr_add", (PyCFunction)bpygpu_VertFormat_attr_add, - METH_VARARGS | METH_KEYWORDS, bpygpu_VertFormat_attr_add_doc}, - {NULL, NULL, 0, NULL} -}; - - -static void bpygpu_VertFormat_dealloc(BPyGPUVertFormat *self) -{ - Py_TYPE(self)->tp_free(self); -} - -PyTypeObject BPyGPUVertFormat_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "GPUVertFormat", - .tp_basicsize = sizeof(BPyGPUVertFormat), - .tp_dealloc = (destructor)bpygpu_VertFormat_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_methods = bpygpu_VertFormat_methods, - .tp_new = bpygpu_VertFormat_new, -}; - -/** \} */ - - -/* -------------------------------------------------------------------- */ - -/** \name VertBuf Type - * \{ */ - -static PyObject *bpygpu_VertBuf_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds) -{ - const char * const keywords[] = {"len", "format", NULL}; - - struct { - BPyGPUVertFormat *py_fmt; - uint len; - } params; - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, - "$IO!:GPUVertBuf.__new__", (char **)keywords, - ¶ms.len, - &BPyGPUVertFormat_Type, ¶ms.py_fmt)) - { - return NULL; - } - - struct GPUVertBuf *vbo = GPU_vertbuf_create_with_format(¶ms.py_fmt->fmt); - - GPU_vertbuf_data_alloc(vbo, params.len); - - return BPyGPUVertBuf_CreatePyObject(vbo); -} - -PyDoc_STRVAR(bpygpu_VertBuf_fill_doc, -"TODO" -); -static PyObject *bpygpu_VertBuf_fill(BPyGPUVertBuf *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"id", "data", NULL}; - - struct { - uint id; - PyObject *py_seq_data; - } params; - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, "$IO:fill", (char **)kwlist, - ¶ms.id, - ¶ms.py_seq_data)) - { - return NULL; - } - - if (params.id >= self->buf->format.attr_len) { - PyErr_Format(PyExc_ValueError, - "Format id %d out of range", - params.id); - return NULL; - } - - if (self->buf->data == NULL) { - PyErr_SetString(PyExc_ValueError, - "Can't fill, static buffer already in use"); - return NULL; - } - - if (!bpygpu_vertbuf_fill_impl(self->buf, params.id, params.py_seq_data)) { - return NULL; - } - Py_RETURN_NONE; -} - -static struct PyMethodDef bpygpu_VertBuf_methods[] = { - {"fill", (PyCFunction) bpygpu_VertBuf_fill, - METH_VARARGS | METH_KEYWORDS, bpygpu_VertBuf_fill_doc}, - {NULL, NULL, 0, NULL} -}; - -static void bpygpu_VertBuf_dealloc(BPyGPUVertBuf *self) -{ - GPU_vertbuf_discard(self->buf); - Py_TYPE(self)->tp_free(self); -} - -PyTypeObject BPyGPUVertBuf_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "GPUVertBuf", - .tp_basicsize = sizeof(BPyGPUVertBuf), - .tp_dealloc = (destructor)bpygpu_VertBuf_dealloc, - .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_methods = bpygpu_VertBuf_methods, - .tp_new = bpygpu_VertBuf_new, -}; - -/** \} */ - - -/* -------------------------------------------------------------------- */ - -/** \name VertBatch Type - * \{ */ - -static PyObject *bpygpu_Batch_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject *kwds) -{ - const char * const keywords[] = {"type", "buf", NULL}; - - struct { - GPUPrimType type_id; - BPyGPUVertBuf *py_buf; - } params; - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, - "$O&O!:GPUBatch.__new__", (char **)keywords, - bpygpu_ParsePrimType, ¶ms.type_id, - &BPyGPUVertBuf_Type, ¶ms.py_buf)) - { - return NULL; - } - - GPUBatch *batch = GPU_batch_create(params.type_id, params.py_buf->buf, NULL); - BPyGPUBatch *ret = (BPyGPUBatch *)BPyGPUBatch_CreatePyObject(batch); - -#ifdef USE_GPU_PY_REFERENCES - ret->references = PyList_New(1); - PyList_SET_ITEM(ret->references, 0, (PyObject *)params.py_buf); - Py_INCREF(params.py_buf); - PyObject_GC_Track(ret); -#endif - - return (PyObject *)ret; -} - -PyDoc_STRVAR(bpygpu_VertBatch_vertbuf_add_doc, -"TODO" -); -static PyObject *bpygpu_VertBatch_vertbuf_add(BPyGPUBatch *self, BPyGPUVertBuf *py_buf) -{ - if (!BPyGPUVertBuf_Check(py_buf)) { - PyErr_Format(PyExc_TypeError, - "Expected a GPUVertBuf, got %s", - Py_TYPE(py_buf)->tp_name); - return NULL; - } - - if (self->batch->verts[0]->vertex_len != py_buf->buf->vertex_len) { - PyErr_Format(PyExc_TypeError, - "Expected %d length, got %d", - self->batch->verts[0]->vertex_len, py_buf->buf->vertex_len); - return NULL; - } - -#ifdef USE_GPU_PY_REFERENCES - /* Hold user */ - PyList_Append(self->references, (PyObject *)py_buf); -#endif - - GPU_batch_vertbuf_add(self->batch, py_buf->buf); - Py_RETURN_NONE; -} - -/* Currently magic number from Py perspective. */ -PyDoc_STRVAR(bpygpu_VertBatch_program_set_builtin_doc, -"TODO" -); -static PyObject *bpygpu_VertBatch_program_set_builtin(BPyGPUBatch *self, PyObject *args, PyObject *kwds) -{ - static const char *kwlist[] = {"id", NULL}; - - struct { - const char *shader; - } params; - - if (!PyArg_ParseTupleAndKeywords( - args, kwds, "s:program_set_builtin", (char **)kwlist, - ¶ms.shader)) - { - return NULL; - } - - GPUBuiltinShader shader; - -#define MATCH_ID(id) \ - if (STREQ(params.shader, STRINGIFY(id))) { \ - shader = GPU_SHADER_##id; \ - goto success; \ - } ((void)0) - - MATCH_ID(2D_FLAT_COLOR); - MATCH_ID(2D_SMOOTH_COLOR); - MATCH_ID(2D_UNIFORM_COLOR); - - MATCH_ID(3D_FLAT_COLOR); - MATCH_ID(3D_SMOOTH_COLOR); - MATCH_ID(3D_UNIFORM_COLOR); - -#undef MATCH_ID - - PyErr_SetString(PyExc_ValueError, - "shader name not known"); - return NULL; - -success: - GPU_batch_program_set_builtin(self->batch, shader); - Py_RETURN_NONE; -} - -static PyObject *bpygpu_VertBatch_uniform_bool(BPyGPUBatch *self, PyObject *args) -{ - struct { - const char *id; - bool values[1]; - } params; - - if (!PyArg_ParseTuple( - args, "sO&:uniform_bool", - ¶ms.id, - PyC_ParseBool, ¶ms.values[0])) - { - return NULL; - } - - GPU_batch_uniform_1b(self->batch, params.id, params.values[0]); - Py_RETURN_NONE; -} - -static PyObject *bpygpu_VertBatch_uniform_i32(BPyGPUBatch *self, PyObject *args) -{ - struct { - const char *id; - int values[1]; - } params; - - if (!PyArg_ParseTuple( - args, "si:uniform_i32", - ¶ms.id, - ¶ms.values[0])) - { - return NULL; - } - - GPU_batch_uniform_1i(self->batch, params.id, params.values[0]); - Py_RETURN_NONE; -} - -static PyObject *bpygpu_VertBatch_uniform_f32(BPyGPUBatch *self, PyObject *args) -{ - struct { - const char *id; - float values[4]; - } params; - - if (!PyArg_ParseTuple( - args, "sf|fff:uniform_f32", - ¶ms.id, - ¶ms.values[0], ¶ms.values[1], ¶ms.values[2], ¶ms.values[3])) - { - return NULL; - } - - switch (PyTuple_GET_SIZE(args)) { - case 2: GPU_batch_uniform_1f(self->batch, params.id, params.values[0]); break; - case 3: GPU_batch_uniform_2f(self->batch, params.id, UNPACK2(params.values)); break; - case 4: GPU_batch_uniform_3f(self->batch, params.id, UNPACK3(params.values)); break; - case 5: GPU_batch_uniform_4f(self->batch, params.id, UNPACK4(params.values)); break; - default: - BLI_assert(0); - } - Py_RETURN_NONE; -} - -PyDoc_STRVAR(bpygpu_VertBatch_draw_doc, -"TODO" -); -static PyObject *bpygpu_VertBatch_draw(BPyGPUBatch *self) -{ - if (!glIsProgram(self->batch->program)) { - PyErr_SetString(PyExc_ValueError, - "batch program has not not set"); - } - GPU_batch_draw(self->batch); - Py_RETURN_NONE; -} - -static PyObject *bpygpu_VertBatch_program_use_begin(BPyGPUBatch *self) -{ - if (!glIsProgram(self->batch->program)) { - PyErr_SetString(PyExc_ValueError, - "batch program has not not set"); - } - GPU_batch_program_use_begin(self->batch); - Py_RETURN_NONE; -} - -static PyObject *bpygpu_VertBatch_program_use_end(BPyGPUBatch *self) -{ - if (!glIsProgram(self->batch->program)) { - PyErr_SetString(PyExc_ValueError, - "batch program has not not set"); - } - GPU_batch_program_use_end(self->batch); - Py_RETURN_NONE; -} - -static struct PyMethodDef bpygpu_VertBatch_methods[] = { - {"vertbuf_add", (PyCFunction)bpygpu_VertBatch_vertbuf_add, - METH_O, bpygpu_VertBatch_vertbuf_add_doc}, - {"program_set_builtin", (PyCFunction)bpygpu_VertBatch_program_set_builtin, - METH_VARARGS | METH_KEYWORDS, bpygpu_VertBatch_program_set_builtin_doc}, - {"uniform_bool", (PyCFunction)bpygpu_VertBatch_uniform_bool, - METH_VARARGS, NULL}, - {"uniform_i32", (PyCFunction)bpygpu_VertBatch_uniform_i32, - METH_VARARGS, NULL}, - {"uniform_f32", (PyCFunction)bpygpu_VertBatch_uniform_f32, - METH_VARARGS, NULL}, - {"draw", (PyCFunction) bpygpu_VertBatch_draw, - METH_NOARGS, bpygpu_VertBatch_draw_doc}, - {"program_use_begin", (PyCFunction)bpygpu_VertBatch_program_use_begin, - METH_NOARGS, ""}, - {"program_use_end", (PyCFunction)bpygpu_VertBatch_program_use_end, - METH_NOARGS, ""}, - {NULL, NULL, 0, NULL} -}; - -#ifdef USE_GPU_PY_REFERENCES - -static int bpygpu_Batch_traverse(BPyGPUBatch *self, visitproc visit, void *arg) -{ - Py_VISIT(self->references); - return 0; -} - -static int bpygpu_Batch_clear(BPyGPUBatch *self) -{ - Py_CLEAR(self->references); - return 0; -} - -#endif - -static void bpygpu_Batch_dealloc(BPyGPUBatch *self) -{ - GPU_batch_discard(self->batch); - -#ifdef USE_GPU_PY_REFERENCES - if (self->references) { - PyObject_GC_UnTrack(self); - bpygpu_Batch_clear(self); - Py_XDECREF(self->references); - } -#endif - - Py_TYPE(self)->tp_free(self); -} - -PyTypeObject BPyGPUBatch_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "GPUBatch", - .tp_basicsize = sizeof(BPyGPUBatch), - .tp_dealloc = (destructor)bpygpu_Batch_dealloc, -#ifdef USE_GPU_PY_REFERENCES - .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, - .tp_traverse = (traverseproc)bpygpu_Batch_traverse, - .tp_clear = (inquiry)bpygpu_Batch_clear, -#else - .tp_flags = Py_TPFLAGS_DEFAULT, -#endif - .tp_methods = bpygpu_VertBatch_methods, - .tp_new = bpygpu_Batch_new, -}; - /* -------------------------------------------------------------------- */ /** \name GPU Types Module * \{ */ -static struct PyModuleDef BPy_BM_types_module_def = { +static struct PyModuleDef BPyGPU_types_module_def = { PyModuleDef_HEAD_INIT, - .m_name = "_gpu.types", + .m_name = "gpu.types", }; PyObject *BPyInit_gpu_types(void) { PyObject *submodule; - submodule = PyModule_Create(&BPy_BM_types_module_def); + submodule = PyModule_Create(&BPyGPU_types_module_def); if (PyType_Ready(&BPyGPUVertFormat_Type) < 0) return NULL; @@ -779,6 +55,8 @@ PyObject *BPyInit_gpu_types(void) return NULL; if (PyType_Ready(&BPyGPUBatch_Type) < 0) return NULL; + if (PyType_Ready(&BPyGPUOffScreen_Type) < 0) + return NULL; #define MODULE_TYPE_ADD(s, t) \ PyModule_AddObject(s, t.tp_name, (PyObject *)&t); Py_INCREF((PyObject *)&t) @@ -786,6 +64,7 @@ PyObject *BPyInit_gpu_types(void) MODULE_TYPE_ADD(submodule, BPyGPUVertFormat_Type); MODULE_TYPE_ADD(submodule, BPyGPUVertBuf_Type); MODULE_TYPE_ADD(submodule, BPyGPUBatch_Type); + MODULE_TYPE_ADD(submodule, BPyGPUOffScreen_Type); #undef MODULE_TYPE_ADD @@ -793,53 +72,3 @@ PyObject *BPyInit_gpu_types(void) } /** \} */ - - -/* -------------------------------------------------------------------- */ - -/** \name Public API - * \{ */ - -PyObject *BPyGPUVertFormat_CreatePyObject(GPUVertFormat *fmt) -{ - BPyGPUVertFormat *self; - - self = PyObject_New(BPyGPUVertFormat, &BPyGPUVertFormat_Type); - if (fmt) { - self->fmt = *fmt; - } - else { - memset(&self->fmt, 0, sizeof(self->fmt)); - } - - return (PyObject *)self; -} - -PyObject *BPyGPUVertBuf_CreatePyObject(GPUVertBuf *buf) -{ - BPyGPUVertBuf *self; - - self = PyObject_New(BPyGPUVertBuf, &BPyGPUVertBuf_Type); - self->buf = buf; - - return (PyObject *)self; -} - - -PyObject *BPyGPUBatch_CreatePyObject(GPUBatch *batch) -{ - BPyGPUBatch *self; - -#ifdef USE_GPU_PY_REFERENCES - self = (BPyGPUBatch *)_PyObject_GC_New(&BPyGPUBatch_Type); - self->references = NULL; -#else - self = PyObject_New(BPyGPUBatch, &BPyGPUBatch_Type); -#endif - - self->batch = batch; - - return (PyObject *)self; -} - -/** \} */ |