isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Remove unused CoglPipelineLightingState

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/merge_requests/904
This commit is contained in:
Adam Jackson 2019-10-29 14:38:49 -04:00
parent 711023ea93
commit e84dbd7faf
2 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cogl/cogl/cogl-pipeline-private.h
View File

@ -190,25 +190,6 @@ typedef enum _CoglPipelineState
COGL_PIPELINE_STATE_VERTEX_SNIPPETS | \ COGL_PIPELINE_STATE_VERTEX_SNIPPETS | \
COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS) COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS)
typedef enum
{
COGL_PIPELINE_LIGHTING_STATE_PROPERTY_AMBIENT = 1,
COGL_PIPELINE_LIGHTING_STATE_PROPERTY_DIFFUSE,
COGL_PIPELINE_LIGHTING_STATE_PROPERTY_SPECULAR,
COGL_PIPELINE_LIGHTING_STATE_PROPERTY_EMISSION,
COGL_PIPELINE_LIGHTING_STATE_PROPERTY_SHININESS
} CoglPipelineLightingStateProperty;
typedef struct
{
/* Standard OpenGL lighting model attributes */
float ambient[4];
float diffuse[4];
float specular[4];
float emission[4];
float shininess;
} CoglPipelineLightingState;
typedef struct typedef struct
{ {
/* Determines what fragments are discarded based on their alpha */ /* Determines what fragments are discarded based on their alpha */
@ -261,7 +242,6 @@ typedef struct
typedef struct typedef struct
{ {
CoglPipelineLightingState lighting_state;
CoglPipelineAlphaFuncState alpha_state; CoglPipelineAlphaFuncState alpha_state;
CoglPipelineBlendState blend_state; CoglPipelineBlendState blend_state;
CoglHandle user_program; CoglHandle user_program;

24
cogl/cogl/cogl-pipeline.c
View File

@ -95,7 +95,6 @@ _cogl_pipeline_init_default_pipeline (void)
/* XXX: NB: It's important that we zero this to avoid polluting /* XXX: NB: It's important that we zero this to avoid polluting
* pipeline hash values with un-initialized data */ * pipeline hash values with un-initialized data */
CoglPipelineBigState *big_state = g_slice_new0 (CoglPipelineBigState); CoglPipelineBigState *big_state = g_slice_new0 (CoglPipelineBigState);
CoglPipelineLightingState *lighting_state = &big_state->lighting_state;
CoglPipelineAlphaFuncState *alpha_state = &big_state->alpha_state; CoglPipelineAlphaFuncState *alpha_state = &big_state->alpha_state;
CoglPipelineBlendState *blend_state = &big_state->blend_state; CoglPipelineBlendState *blend_state = &big_state->blend_state;
CoglPipelineCullFaceState *cull_face_state = &big_state->cull_face_state; CoglPipelineCullFaceState *cull_face_state = &big_state->cull_face_state;
@ -142,29 +141,6 @@ _cogl_pipeline_init_default_pipeline (void)
/* Use the same defaults as the GL spec... */ /* Use the same defaults as the GL spec... */
cogl_color_init_from_4ub (&pipeline->color, 0xff, 0xff, 0xff, 0xff); cogl_color_init_from_4ub (&pipeline->color, 0xff, 0xff, 0xff, 0xff);
/* Use the same defaults as the GL spec... */
lighting_state->ambient[0] = 0.2;
lighting_state->ambient[1] = 0.2;
lighting_state->ambient[2] = 0.2;
lighting_state->ambient[3] = 1.0;
lighting_state->diffuse[0] = 0.8;
lighting_state->diffuse[1] = 0.8;
lighting_state->diffuse[2] = 0.8;
lighting_state->diffuse[3] = 1.0;
lighting_state->specular[0] = 0;
lighting_state->specular[1] = 0;
lighting_state->specular[2] = 0;
lighting_state->specular[3] = 1.0;
lighting_state->emission[0] = 0;
lighting_state->emission[1] = 0;
lighting_state->emission[2] = 0;
lighting_state->emission[3] = 1.0;
lighting_state->shininess = 0.0f;
/* Use the same defaults as the GL spec... */ /* Use the same defaults as the GL spec... */
alpha_state->alpha_func = COGL_PIPELINE_ALPHA_FUNC_ALWAYS; alpha_state->alpha_func = COGL_PIPELINE_ALPHA_FUNC_ALWAYS;
alpha_state->alpha_func_reference = 0.0; alpha_state->alpha_func_reference = 0.0;