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

Cleanup: use new format string utility

Browse Source
This commit is contained in:
Germano Cavalcante
2018-10-06 00:13:54 -03:00
parent 98e62d459a
commit 0f55334413
2 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,8 @@
#include "GPU_glew.h" #include "GPU_glew.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "../generic/py_capi_utils.h"
#include "bgl.h" #include "bgl.h"
@@ -478,29 +480,19 @@ int BGL_typeSize(int type)
static int gl_buffer_type_from_py_buffer(Py_buffer *pybuffer) static int gl_buffer_type_from_py_buffer(Py_buffer *pybuffer)
{ {
char *typestr = pybuffer->format; const char format = FORMAT_STR_GET(pybuffer->format);
Py_ssize_t itemsize = pybuffer->itemsize; Py_ssize_t itemsize = pybuffer->itemsize;
if (ELEM(typestr[0], '<', '>', '|')) { if (FORMAT_STR_IS_FLOAT(format)) {
typestr += 1; if (itemsize == 4) return GL_FLOAT;
if (itemsize == 8) return GL_DOUBLE;
}
if (FORMAT_STR_IS_BYTE(format) || FORMAT_STR_IS_INT(format)) {
if (itemsize == 1) return GL_BYTE;
if (itemsize == 2) return GL_SHORT;
if (itemsize == 4) return GL_INT;
} }
switch (typestr[0]) {
case 't':
case 'b':
case 'h':
case 'i':
case 'l':
if (itemsize == 1) return GL_BYTE;
if (itemsize == 2) return GL_SHORT;
if (itemsize == 4) return GL_INT;
break;
case 'f':
case 'd':
if (itemsize == 4) return GL_FLOAT;
if (itemsize == 8) return GL_DOUBLE;
break;
}
return -1; /* UNKNOWN */ return -1; /* UNKNOWN */
} }

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

@@ -93,11 +93,8 @@ static PyObject *bpygpu_IndexBuf_new(PyTypeObject *UNUSED(type), PyObject *args,
bool format_error = pybuffer.itemsize != 4; bool format_error = pybuffer.itemsize != 4;
{ {
char *typestr = pybuffer.format; char format = FORMAT_STR_GET(pybuffer.format);
if (ELEM(typestr[0], '<', '>', '|')) { if (FORMAT_STR_IS_FLOAT(format)) {
typestr += 1;
}
if (ELEM(typestr[0], 'f', 'd')) {
format_error = true; format_error = true;
} }
} }