isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-02-03 12:31:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore -Wdiscarded-qualifiers warning with const vtables

Browse Source
This commit is contained in:
Anonymous Maarten 2024-06-25 16:05:13 +02:00
parent 2643cda499
commit 192a59fe0b
9 changed files with 105 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3rdparty/d3drm/d3drm.c vendored
View File

@ -2328,9 +2328,16 @@ HRESULT WINAPI Direct3DRMCreate(IDirect3DRM **d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRM_iface.lpVtbl = &d3drm1_vtbl;
object->IDirect3DRM2_iface.lpVtbl = &d3drm2_vtbl;
object->IDirect3DRM3_iface.lpVtbl = &d3drm3_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref1 = 1;
object->iface_count = 1;

7
3rdparty/d3drm/device.c vendored
View File

@ -1663,10 +1663,17 @@ HRESULT d3drm_device_create(struct d3drm_device **device, IDirect3DRM *d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMDevice_iface.lpVtbl = &d3drm_device1_vtbl;
object->IDirect3DRMDevice2_iface.lpVtbl = &d3drm_device2_vtbl;
object->IDirect3DRMDevice3_iface.lpVtbl = &d3drm_device3_vtbl;
object->IDirect3DRMWinDevice_iface.lpVtbl = &d3drm_device_win_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->d3drm = d3drm;
d3drm_object_init(&object->obj, classname);

7
3rdparty/d3drm/face.c vendored
View File

@ -627,8 +627,15 @@ HRESULT d3drm_face_create(struct d3drm_face **face)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMFace_iface.lpVtbl = &d3drm_face1_vtbl;
object->IDirect3DRMFace2_iface.lpVtbl = &d3drm_face2_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
d3drm_object_init(&object->obj, classname);

35
3rdparty/d3drm/frame.c vendored
View File

@ -261,7 +261,14 @@ static struct d3drm_frame_array *d3drm_frame_array_create(unsigned int frame_cou
if (!(array = calloc(1, sizeof(*array))))
return NULL;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
array->ref = 1;
array->size = frame_count;
@ -379,7 +386,14 @@ static struct d3drm_visual_array *d3drm_visual_array_create(unsigned int visual_
if (!(array = calloc(1, sizeof(*array))))
return NULL;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
array->IDirect3DRMVisualArray_iface.lpVtbl = &d3drm_visual_array_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
array->ref = 1;
array->size = visual_count;
@ -498,7 +512,14 @@ static struct d3drm_light_array *d3drm_light_array_create(unsigned int light_cou
if (!(array = calloc(1, sizeof(*array))))
return NULL;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
array->IDirect3DRMLightArray_iface.lpVtbl = &d3drm_light_array_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
array->ref = 1;
array->size = light_count;
@ -3137,9 +3158,16 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMFrame_iface.lpVtbl = &d3drm_frame1_vtbl;
object->IDirect3DRMFrame2_iface.lpVtbl = &d3drm_frame2_vtbl;
object->IDirect3DRMFrame3_iface.lpVtbl = &d3drm_frame3_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->d3drm = d3drm;
object->ref = 1;
d3drm_set_color(&object->scenebackground, 0.0f, 0.0f, 0.0f, 1.0f);
@ -3889,8 +3917,15 @@ HRESULT d3drm_animation_create(struct d3drm_animation **animation, IDirect3DRM *
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMAnimation_iface.lpVtbl = &d3drm_animation1_vtbl;
object->IDirect3DRMAnimation2_iface.lpVtbl = &d3drm_animation2_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->d3drm = d3drm;
object->ref = 1;
object->options = D3DRMANIMATION_CLOSED | D3DRMANIMATION_LINEARPOSITION;

7
3rdparty/d3drm/light.c vendored
View File

@ -378,7 +378,14 @@ HRESULT d3drm_light_create(struct d3drm_light **light, IDirect3DRM *d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMLight_iface.lpVtbl = &d3drm_light_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
object->d3drm = d3drm;
IDirect3DRM_AddRef(object->d3drm);

7
3rdparty/d3drm/material.c vendored
View File

@ -286,7 +286,14 @@ HRESULT d3drm_material_create(struct d3drm_material **material, IDirect3DRM *d3d
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMMaterial2_iface.lpVtbl = &d3drm_material_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
object->d3drm = d3drm;
IDirect3DRM_AddRef(object->d3drm);

21
3rdparty/d3drm/meshbuilder.c vendored
View File

@ -2343,8 +2343,15 @@ HRESULT d3drm_mesh_builder_create(struct d3drm_mesh_builder **mesh_builder, IDir
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMMeshBuilder2_iface.lpVtbl = &d3drm_mesh_builder2_vtbl;
object->IDirect3DRMMeshBuilder3_iface.lpVtbl = &d3drm_mesh_builder3_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
object->d3drm = d3drm;
object->quality = D3DRMRENDER_GOURAUD;
@ -2843,7 +2850,14 @@ HRESULT d3drm_mesh_create(struct d3drm_mesh **mesh, IDirect3DRM *d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMMesh_iface.lpVtbl = &d3drm_mesh_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
object->d3drm = d3drm;
IDirect3DRM_AddRef(object->d3drm);
@ -3029,7 +3043,14 @@ HRESULT d3drm_wrap_create(struct d3drm_wrap **wrap, IDirect3DRM *d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMWrap_iface.lpVtbl = &d3drm_wrap_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->ref = 1;
d3drm_object_init(&object->obj, classname);

7
3rdparty/d3drm/texture.c vendored
View File

@ -1467,9 +1467,16 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm)
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl;
object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl;
object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->d3drm = d3drm;
object->max_colors = 8;
object->max_shades = 16;

7
3rdparty/d3drm/viewport.c vendored
View File

@ -1136,8 +1136,15 @@ HRESULT d3drm_viewport_create(struct d3drm_viewport **viewport, IDirect3DRM *d3d
if (!(object = calloc(1, sizeof(*object))))
return E_OUTOFMEMORY;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
#endif
object->IDirect3DRMViewport_iface.lpVtbl = &d3drm_viewport1_vtbl;
object->IDirect3DRMViewport2_iface.lpVtbl = &d3drm_viewport2_vtbl;
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
object->d3drm = d3drm;
d3drm_object_init(&object->obj, classname);