mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 17:40:40 -05:00
cogl: Drop CoglHandleObject and CoglHandleClass
They're just typedefs to CoglObject and CoglObjectClass, respectively, and the latter is unused already. The former is used in a couple of deprecated headers, which can easily be changed. Change all CoglHandleObject instances to CoglObject, and drop the types Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2355>
This commit is contained in:
parent
631056bf49
commit
62330f273d
@ -38,10 +38,6 @@
|
|||||||
#include "cogl-object.h"
|
#include "cogl-object.h"
|
||||||
#include "cogl-debug.h"
|
#include "cogl-debug.h"
|
||||||
|
|
||||||
/* For compatibility until all components have been converted */
|
|
||||||
typedef struct _CoglObjectClass CoglHandleClass;
|
|
||||||
typedef struct _CoglObject CoglHandleObject;
|
|
||||||
|
|
||||||
/* XXX: sadly we didn't fully consider when we copied the cairo API
|
/* XXX: sadly we didn't fully consider when we copied the cairo API
|
||||||
* for _set_user_data that the callback doesn't get a pointer to the
|
* for _set_user_data that the callback doesn't get a pointer to the
|
||||||
* instance which is desired in most cases. This means you tend to end
|
* instance which is desired in most cases. This means you tend to end
|
||||||
|
@ -38,7 +38,7 @@ typedef struct _CoglProgram CoglProgram;
|
|||||||
|
|
||||||
struct _CoglProgram
|
struct _CoglProgram
|
||||||
{
|
{
|
||||||
CoglHandleObject _parent;
|
CoglObject _parent;
|
||||||
|
|
||||||
GSList *attached_shaders;
|
GSList *attached_shaders;
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ typedef struct _CoglShader CoglShader;
|
|||||||
|
|
||||||
struct _CoglShader
|
struct _CoglShader
|
||||||
{
|
{
|
||||||
CoglHandleObject _parent;
|
CoglObject _parent;
|
||||||
GLuint gl_handle;
|
GLuint gl_handle;
|
||||||
CoglPipeline *compilation_pipeline;
|
CoglPipeline *compilation_pipeline;
|
||||||
CoglShaderType type;
|
CoglShaderType type;
|
||||||
|
Loading…
Reference in New Issue
Block a user