forked from bartvdbraak/blender
Cleanup: IMB prefix for ImBuf defines
This commit is contained in:
parent
e142ae77ca
commit
2d32b92d77
@ -1099,7 +1099,7 @@ static uintptr_t image_mem_size(Image *image)
|
|||||||
size += MEM_allocN_len(ibuf->rect_float);
|
size += MEM_allocN_len(ibuf->rect_float);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (level = 0; level < IB_MIPMAP_LEVELS; level++) {
|
for (level = 0; level < IMB_MIPMAP_LEVELS; level++) {
|
||||||
ibufm = ibuf->mipmap[level];
|
ibufm = ibuf->mipmap[level];
|
||||||
if (ibufm) {
|
if (ibufm) {
|
||||||
if (ibufm->rect) {
|
if (ibufm->rect) {
|
||||||
|
@ -92,7 +92,7 @@ typedef struct UndoImageTile {
|
|||||||
struct UndoImageTile *next, *prev;
|
struct UndoImageTile *next, *prev;
|
||||||
|
|
||||||
char idname[MAX_ID_NAME]; /* name instead of pointer*/
|
char idname[MAX_ID_NAME]; /* name instead of pointer*/
|
||||||
char ibufname[IB_FILENAME_SIZE];
|
char ibufname[IMB_FILENAME_SIZE];
|
||||||
|
|
||||||
union {
|
union {
|
||||||
float *fp;
|
float *fp;
|
||||||
|
@ -47,8 +47,8 @@
|
|||||||
* contains an Amiga-format file).
|
* contains an Amiga-format file).
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define IB_MIPMAP_LEVELS 20
|
#define IMB_MIPMAP_LEVELS 20
|
||||||
#define IB_FILENAME_SIZE 1024
|
#define IMB_FILENAME_SIZE 1024
|
||||||
|
|
||||||
typedef struct DDSData {
|
typedef struct DDSData {
|
||||||
unsigned int fourcc; /* DDS fourcc info */
|
unsigned int fourcc; /* DDS fourcc info */
|
||||||
@ -177,7 +177,7 @@ typedef struct ImBuf {
|
|||||||
float dither; /* random dither value, for conversion from float -> byte rect */
|
float dither; /* random dither value, for conversion from float -> byte rect */
|
||||||
|
|
||||||
/* mipmapping */
|
/* mipmapping */
|
||||||
struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /* MipMap levels, a series of halved images */
|
struct ImBuf *mipmap[IMB_MIPMAP_LEVELS]; /* MipMap levels, a series of halved images */
|
||||||
int miptot, miplevel;
|
int miptot, miplevel;
|
||||||
|
|
||||||
/* externally used data */
|
/* externally used data */
|
||||||
@ -189,8 +189,8 @@ typedef struct ImBuf {
|
|||||||
/* file information */
|
/* file information */
|
||||||
enum eImbTypes ftype; /* file type we are going to save as */
|
enum eImbTypes ftype; /* file type we are going to save as */
|
||||||
ImbFormatOptions foptions; /* file format specific flags */
|
ImbFormatOptions foptions; /* file format specific flags */
|
||||||
char name[IB_FILENAME_SIZE]; /* filename associated with this image */
|
char name[IMB_FILENAME_SIZE]; /* filename associated with this image */
|
||||||
char cachename[IB_FILENAME_SIZE]; /* full filename used for reading from cache */
|
char cachename[IMB_FILENAME_SIZE]; /* full filename used for reading from cache */
|
||||||
|
|
||||||
/* memory cache limiter */
|
/* memory cache limiter */
|
||||||
struct MEM_CacheLimiterHandle_s *c_handle; /* handle for cache limiter */
|
struct MEM_CacheLimiterHandle_s *c_handle; /* handle for cache limiter */
|
||||||
|
@ -492,7 +492,7 @@ ImBuf *IMB_dupImBuf(ImBuf *ibuf1)
|
|||||||
tbuf.encodedbuffer = ibuf2->encodedbuffer;
|
tbuf.encodedbuffer = ibuf2->encodedbuffer;
|
||||||
tbuf.zbuf = NULL;
|
tbuf.zbuf = NULL;
|
||||||
tbuf.zbuf_float = NULL;
|
tbuf.zbuf_float = NULL;
|
||||||
for (a = 0; a < IB_MIPMAP_LEVELS; a++)
|
for (a = 0; a < IMB_MIPMAP_LEVELS; a++)
|
||||||
tbuf.mipmap[a] = NULL;
|
tbuf.mipmap[a] = NULL;
|
||||||
tbuf.dds_data.data = NULL;
|
tbuf.dds_data.data = NULL;
|
||||||
|
|
||||||
|
@ -472,7 +472,7 @@ void IMB_remakemipmap(ImBuf *ibuf, int use_filter)
|
|||||||
|
|
||||||
ibuf->miptot = 1;
|
ibuf->miptot = 1;
|
||||||
|
|
||||||
while (curmap < IB_MIPMAP_LEVELS) {
|
while (curmap < IMB_MIPMAP_LEVELS) {
|
||||||
|
|
||||||
if (ibuf->mipmap[curmap]) {
|
if (ibuf->mipmap[curmap]) {
|
||||||
|
|
||||||
@ -512,7 +512,7 @@ void IMB_makemipmap(ImBuf *ibuf, int use_filter)
|
|||||||
|
|
||||||
ibuf->miptot = 1;
|
ibuf->miptot = 1;
|
||||||
|
|
||||||
while (curmap < IB_MIPMAP_LEVELS) {
|
while (curmap < IMB_MIPMAP_LEVELS) {
|
||||||
if (use_filter) {
|
if (use_filter) {
|
||||||
ImBuf *nbuf = IMB_allocImBuf(hbuf->x, hbuf->y, 32, IB_rect);
|
ImBuf *nbuf = IMB_allocImBuf(hbuf->x, hbuf->y, 32, IB_rect);
|
||||||
IMB_filterN(nbuf, hbuf);
|
IMB_filterN(nbuf, hbuf);
|
||||||
|
@ -192,22 +192,22 @@ static void imb_cache_filename(char *filename, const char *name, int flags)
|
|||||||
{
|
{
|
||||||
/* read .tx instead if it exists and is not older */
|
/* read .tx instead if it exists and is not older */
|
||||||
if (flags & IB_tilecache) {
|
if (flags & IB_tilecache) {
|
||||||
BLI_strncpy(filename, name, IB_FILENAME_SIZE);
|
BLI_strncpy(filename, name, IMB_FILENAME_SIZE);
|
||||||
if (!BLI_replace_extension(filename, IB_FILENAME_SIZE, ".tx"))
|
if (!BLI_replace_extension(filename, IMB_FILENAME_SIZE, ".tx"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (BLI_file_older(name, filename))
|
if (BLI_file_older(name, filename))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
BLI_strncpy(filename, name, IB_FILENAME_SIZE);
|
BLI_strncpy(filename, name, IMB_FILENAME_SIZE);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImBuf *IMB_loadiffname(const char *filepath, int flags, char colorspace[IM_MAX_SPACE])
|
ImBuf *IMB_loadiffname(const char *filepath, int flags, char colorspace[IM_MAX_SPACE])
|
||||||
{
|
{
|
||||||
ImBuf *ibuf;
|
ImBuf *ibuf;
|
||||||
int file, a;
|
int file, a;
|
||||||
char filepath_tx[IB_FILENAME_SIZE];
|
char filepath_tx[IMB_FILENAME_SIZE];
|
||||||
|
|
||||||
BLI_assert(!BLI_path_is_rel(filepath));
|
BLI_assert(!BLI_path_is_rel(filepath));
|
||||||
|
|
||||||
@ -236,7 +236,7 @@ ImBuf *IMB_testiffname(const char *filepath, int flags)
|
|||||||
{
|
{
|
||||||
ImBuf *ibuf;
|
ImBuf *ibuf;
|
||||||
int file;
|
int file;
|
||||||
char filepath_tx[IB_FILENAME_SIZE];
|
char filepath_tx[IMB_FILENAME_SIZE];
|
||||||
char colorspace[IM_MAX_SPACE] = "\0";
|
char colorspace[IM_MAX_SPACE] = "\0";
|
||||||
|
|
||||||
BLI_assert(!BLI_path_is_rel(filepath));
|
BLI_assert(!BLI_path_is_rel(filepath));
|
||||||
|
@ -1145,7 +1145,7 @@ static int imagewraposa_aniso(Tex *tex, Image *ima, ImBuf *ibuf, const float tex
|
|||||||
ImBuf *previbuf, *curibuf;
|
ImBuf *previbuf, *curibuf;
|
||||||
float levf;
|
float levf;
|
||||||
int maxlev;
|
int maxlev;
|
||||||
ImBuf *mipmaps[IB_MIPMAP_LEVELS + 1];
|
ImBuf *mipmaps[IMB_MIPMAP_LEVELS + 1];
|
||||||
|
|
||||||
/* modify ellipse minor axis if too eccentric, use for area sampling as well
|
/* modify ellipse minor axis if too eccentric, use for area sampling as well
|
||||||
* scaling dxt/dyt as done in pbrt is not the same
|
* scaling dxt/dyt as done in pbrt is not the same
|
||||||
@ -1185,7 +1185,7 @@ static int imagewraposa_aniso(Tex *tex, Image *ima, ImBuf *ibuf, const float tex
|
|||||||
curmap = 0;
|
curmap = 0;
|
||||||
maxlev = 1;
|
maxlev = 1;
|
||||||
mipmaps[0] = ibuf;
|
mipmaps[0] = ibuf;
|
||||||
while (curmap < IB_MIPMAP_LEVELS) {
|
while (curmap < IMB_MIPMAP_LEVELS) {
|
||||||
mipmaps[curmap + 1] = ibuf->mipmap[curmap];
|
mipmaps[curmap + 1] = ibuf->mipmap[curmap];
|
||||||
if (ibuf->mipmap[curmap]) maxlev++;
|
if (ibuf->mipmap[curmap]) maxlev++;
|
||||||
curmap++;
|
curmap++;
|
||||||
@ -1585,7 +1585,7 @@ int imagewraposa(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], const
|
|||||||
|
|
||||||
curmap= 0;
|
curmap= 0;
|
||||||
previbuf= curibuf= ibuf;
|
previbuf= curibuf= ibuf;
|
||||||
while (curmap<IB_MIPMAP_LEVELS && ibuf->mipmap[curmap]) {
|
while (curmap < IMB_MIPMAP_LEVELS && ibuf->mipmap[curmap]) {
|
||||||
if (maxd < pixsize) break;
|
if (maxd < pixsize) break;
|
||||||
previbuf= curibuf;
|
previbuf= curibuf;
|
||||||
curibuf= ibuf->mipmap[curmap];
|
curibuf= ibuf->mipmap[curmap];
|
||||||
|
Loading…
Reference in New Issue
Block a user