Use calloc in lovrAlloc;

This commit is contained in:
bjorn 2018-03-21 12:56:16 -07:00
parent 4b82a12b15
commit d2e0642b59
14 changed files with 3 additions and 48 deletions

View File

@ -32,7 +32,6 @@ Source* lovrSourceCreate(AudioStream* stream) {
if (!source) return NULL;
source->stream = stream;
source->isLooping = false;
alGenSources(1, &source->id);
alGenBuffers(SOURCE_BUFFERS, source->buffers);
lovrRetain(stream);

View File

@ -7,7 +7,6 @@ Blob* lovrBlobCreate(void* data, size_t size, const char* name) {
blob->data = data;
blob->size = size;
blob->name = name;
blob->seek = 0;
return blob;
}

View File

@ -266,9 +266,6 @@ ModelData* lovrModelDataCreate(Blob* blob) {
lovrThrow("Unable to load model from '%s': %s\n", blob->name, aiGetErrorString());
}
modelData->nodeCount = 0;
modelData->indexCount = 0;
uint32_t vertexCount = 0;
bool hasNormals = false;
bool hasUVs = false;

View File

@ -135,7 +135,6 @@ TextureData* lovrTextureDataGetBlank(int width, int height, uint8_t value, Textu
textureData->format = format;
textureData->blob.size = size;
textureData->blob.data = memset(malloc(size), value, size);
textureData->source = NULL;
vec_init(&textureData->mipmaps);
return textureData;
}
@ -149,7 +148,6 @@ TextureData* lovrTextureDataGetEmpty(int width, int height, TextureFormat format
textureData->height = height;
textureData->format = format;
textureData->blob.data = NULL;
textureData->source = NULL;
vec_init(&textureData->mipmaps);
return textureData;
}
@ -169,7 +167,6 @@ TextureData* lovrTextureDataFromBlob(Blob* blob) {
stbi_set_flip_vertically_on_load(1);
textureData->format = FORMAT_RGBA;
textureData->blob.data = stbi_load_from_memory(blob->data, blob->size, &textureData->width, &textureData->height, NULL, 4);
textureData->source = NULL;
if (!textureData->blob.data) {
lovrThrow("Could not load texture data from '%s'", blob->name);

View File

@ -19,6 +19,8 @@ VertexData* lovrVertexDataCreate(uint32_t count, VertexFormat* format, bool allo
VertexData* vertexData = lovrAlloc(sizeof(VertexData), lovrBlobDestroy);
if (!vertexData) return NULL;
vertexData->count = count;
if (format) {
vertexData->format = *format;
} else {
@ -30,9 +32,6 @@ VertexData* lovrVertexDataCreate(uint32_t count, VertexFormat* format, bool allo
vertexFormatAppend(&vertexData->format, "lovrVertexColor", ATTR_BYTE, 4);
}
vertexData->count = count;
vertexData->blob.data = NULL;
if (allocate) {
size_t size = format->stride * count;
vertexData->blob.data = calloc(1, size);

View File

@ -6,7 +6,6 @@ File* lovrFileCreate(const char* path) {
if (!file) return NULL;
file->path = path;
file->handle = NULL;
return file;
}

View File

@ -27,10 +27,6 @@ Canvas* lovrCanvasCreate(int width, int height, TextureFormat format, int msaa,
Canvas* canvas = lovrAlloc(sizeof(Canvas), lovrCanvasDestroy);
canvas->texture = *texture;
canvas->msaa = msaa;
canvas->framebuffer = 0;
canvas->resolveFramebuffer = 0;
canvas->depthStencilBuffer = 0;
canvas->msaaTexture = 0;
// Framebuffer
glGenFramebuffers(1, &canvas->framebuffer);

View File

@ -28,7 +28,6 @@ Font* lovrFontCreate(Rasterizer* rasterizer) {
lovrRetain(rasterizer);
font->rasterizer = rasterizer;
font->texture = NULL;
font->lineHeight = 1.f;
font->pixelDensity = (float) font->rasterizer->height;
map_init(&font->kerning);

View File

@ -15,10 +15,6 @@ Material* lovrMaterialCreate(bool isDefault) {
material->colors[i] = (Color) { 1, 1, 1, 1 };
}
for (int i = 0; i < MAX_MATERIAL_TEXTURES; i++) {
material->textures[i] = NULL;
}
return material;
}

View File

@ -72,22 +72,9 @@ Mesh* lovrMeshCreate(VertexData* vertexData, MeshDrawMode drawMode, MeshUsage us
uint32_t count = vertexData->count;
mesh->vertexData = vertexData;
mesh->indices.raw = NULL;
mesh->indexCount = 0;
mesh->indexSize = count > USHRT_MAX ? sizeof(uint32_t) : sizeof(uint16_t);
mesh->isMapped = false;
mesh->mapStart = 0;
mesh->mapCount = 0;
mesh->isRangeEnabled = false;
mesh->rangeStart = 0;
mesh->rangeCount = count;
mesh->drawMode = drawMode;
mesh->usage = usage;
mesh->vao = 0;
mesh->vbo = 0;
mesh->ibo = 0;
mesh->material = NULL;
mesh->isAttachment = false;
glGenBuffers(1, &mesh->vbo);
glGenBuffers(1, &mesh->ibo);
@ -101,8 +88,6 @@ Mesh* lovrMeshCreate(VertexData* vertexData, MeshDrawMode drawMode, MeshUsage us
map_set(&mesh->attachments, vertexData->format.attributes[i].name, attachment);
}
memset(mesh->layout, 0, MAX_ATTACHMENTS * sizeof(MeshAttachment));
return mesh;
}

View File

@ -56,8 +56,6 @@ Model* lovrModelCreate(ModelData* modelData) {
lovrRetain(modelData);
model->modelData = modelData;
model->aabbDirty = true;
model->animator = NULL;
model->material = NULL;
model->mesh = lovrMeshCreate(modelData->vertexData, MESH_TRIANGLES, MESH_STATIC);
VertexPointer vertices = lovrMeshMap(model->mesh, 0, modelData->vertexData->count, false, true);
@ -71,12 +69,8 @@ Model* lovrModelCreate(ModelData* modelData) {
for (int i = 0; i < modelData->textures.length; i++) {
if (modelData->textures.data[i]) {
model->textures[i] = lovrTextureCreate(TEXTURE_2D, (TextureData**) &modelData->textures.data[i], 1, i == 2, true);
} else {
model->textures[i] = NULL;
}
}
} else {
model->textures = NULL;
}
if (modelData->materialCount > 0) {
@ -96,8 +90,6 @@ Model* lovrModelCreate(ModelData* modelData) {
lovrMaterialSetTexture(material, TEXTURE_NORMAL, model->textures[materialData->normalTexture]);
model->materials[i] = material;
}
} else {
model->materials = NULL;
}
for (int i = 0; i < MAX_BONES; i++) {

View File

@ -92,7 +92,6 @@ Texture* lovrTextureCreate(TextureType type, TextureData** slices, int sliceCoun
texture->sliceCount = sliceCount;
texture->srgb = srgb;
texture->mipmaps = mipmaps;
texture->allocated = false;
WrapMode wrap = type == TEXTURE_CUBE ? WRAP_CLAMP : WRAP_REPEAT;
glGenTextures(1, &texture->id);

View File

@ -10,8 +10,6 @@ Channel* lovrChannelCreate() {
vec_init(&channel->messages);
mtx_init(&channel->lock, mtx_plain | mtx_timed);
cnd_init(&channel->cond);
channel->sent = 0;
channel->received = 0;
return channel;
}

View File

@ -35,7 +35,7 @@ void lovrSleep(double seconds) {
}
void* lovrAlloc(size_t size, void (*destructor)(void* object)) {
void* object = malloc(size);
void* object = calloc(1, size);
if (!object) return NULL;
*((Ref*) object) = (Ref) { destructor, 1 };
return object;