archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: order shape_len after shape argument

Browse Source 
This matches nearly all other argument ordering in Blender,
including Python mathutils API.
This commit is contained in:
Campbell Barton
2021-02-18 13:32:35 +11:00
parent 10a54bbd06
commit e79916eb47
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/gpu/gpu_py_buffer.c
View File

@@ -369,7 +369,7 @@ static PyObject *pygpu_buffer__tp_new(PyTypeObject *UNUSED(type), PyObject *args
PyBuffer_Release(&pybuffer);
}
else {
buffer = BPyGPU_Buffer_CreatePyObject(pygpu_dataformat.value_found, shape_len, shape, NULL);
buffer = BPyGPU_Buffer_CreatePyObject(pygpu_dataformat.value_found, shape, shape_len, NULL);
if (init && pygpu_buffer_ass_slice(buffer, 0, shape[0], init)) {
Py_DECREF(buffer);
return NULL;
@@ -654,8 +654,8 @@ size_t bpygpu_Buffer_size(BPyGPUBuffer *buffer)
* with the correct format from which the buffer will be initialized
*/
BPyGPUBuffer *BPyGPU_Buffer_CreatePyObject(const int format,
const int shape_len,
const Py_ssize_t *shape,
const int shape_len,
void *buffer)
{
if (buffer == NULL) {

2
source/blender/python/gpu/gpu_py_buffer.h
View File

@@ -48,6 +48,6 @@ typedef struct BPyGPUBuffer {
size_t bpygpu_Buffer_size(BPyGPUBuffer *buffer);
BPyGPUBuffer *BPyGPU_Buffer_CreatePyObject(const int format,
const int shape_len,
const Py_ssize_t *shape,
const int shape_len,
void *buffer);

7
source/blender/python/gpu/gpu_py_texture.c
View File

@@ -390,11 +390,8 @@ static PyObject *pygpu_texture_read(BPyGPUTexture *self)
}
void *buf = GPU_texture_read(self->tex, best_data_format, 0);
return (PyObject *)BPyGPU_Buffer_CreatePyObject(
best_data_format,
2,
(Py_ssize_t[2]){GPU_texture_height(self->tex), GPU_texture_width(self->tex)},
buf);
const Py_ssize_t shape[2] = {GPU_texture_height(self->tex), GPU_texture_width(self->tex)};
return (PyObject *)BPyGPU_Buffer_CreatePyObject(best_data_format, shape, ARRAY_SIZE(shape), buf);
}
#ifdef BPYGPU_USE_GPUOBJ_FREE_METHOD