griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPU: Fix typo.

Browse Source
This commit is contained in:
Clément Foucault
2018-03-05 21:52:02 +01:00
parent b55077a506
commit 2faa809ea6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/GPU_material.h
View File

@@ -144,11 +144,11 @@ typedef struct GPUNodeStack {
bool end;
} GPUNodeStack;
typedef enum GPUMaterialSatus {
typedef enum GPUMaterialStatus {
GPU_MAT_FAILED = 0,
GPU_MAT_QUEUED,
GPU_MAT_SUCCESS,
} GPUMaterialSatus;
} GPUMaterialStatus;
#define GPU_DYNAMIC_GROUP_FROM_TYPE(f) ((f) & 0xFFFF0000)
@@ -270,7 +270,7 @@ bool GPU_material_bound(GPUMaterial *material);
struct Scene *GPU_material_scene(GPUMaterial *material);
GPUMatType GPU_Material_get_type(GPUMaterial *material);
struct GPUPass *GPU_material_get_pass(GPUMaterial *material);
GPUMaterialSatus GPU_material_status(GPUMaterial *mat);
GPUMaterialStatus GPU_material_status(GPUMaterial *mat);
struct GPUUniformBuffer *GPU_material_get_uniform_buffer(GPUMaterial *material);
void GPU_material_create_uniform_buffer(GPUMaterial *material, struct ListBase *inputs);

4
source/blender/gpu/intern/gpu_material.c
View File

@@ -105,7 +105,7 @@ struct GPUMaterial {
/* material for mesh surface, worlds or something else.
* some code generation is done differently depending on the use case */
int type; /* DEPRECATED */
GPUMaterialSatus status;
GPUMaterialStatus status;
const void *engine_type; /* attached engine type */
int options; /* to identify shader variations (shadow, probe, world background...) */
@@ -843,7 +843,7 @@ void gpu_material_add_node(GPUMaterial *material, GPUNode *node)
}
/* Return true if the material compilation has not yet begin or begin. */
GPUMaterialSatus GPU_material_status(GPUMaterial *mat)
GPUMaterialStatus GPU_material_status(GPUMaterial *mat)
{
return mat->status;
}