Skip to contentSkip to conversation

vk/intel: use negative VK_NO_PROTOTYPES scheme

PATCH Eric Engestrom 5 participants 7 messages Apr 28, 2016 – May 9, 2016 3 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): CACvgo50DC8MV9hQbo2rnZfmKe0WdwKNPwnBPoyEPKsrVAjJW8w@mail.gmail.com

#3 lore raw
Quoted 28 lines · Emil Velikov
Quoted 5 lines · Eric Engestrom

Commit 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all the VK_PROTOTYPES to VK_NO_PROTOTYPES
This brings the Intel header in line with the rest of the Vulkan code.

Quoted 20 lines

---

This might break code that was using the old guard scheme (not sure how that could've worked anyway).
What the policy on this?

v2: rebase on top of 3caf2e89aa1711e80db80d2056e0a44663d9c7d2
("anv: fix build without Wayland platform"). Should've done that the first time around, sorry :]

 include/vulkan/vulkan_intel.h  | 2 +-
 src/intel/vulkan/anv_private.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
include/vulkan/vulkan_intel.h +0 -0
index 1f77128..8ede61b 100644
@@ -44,7 +44,7 @@ typedef struct VkDmaBufImageCreateInfo_
 
Quoted 7 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 48

Quoted 5 lines
include/vulkan/vulkan_intel.h +1 -1
 typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage);
 
-#ifdef VK_PROTOTYPES
+#ifndef VK_NO_PROTOTYPES
 

Would be great to hear from the Intel guys, if there is a another Cannonical repo where this change should land first ?

CC'ing intel-gfx even though this isn't X-related, because I don't know of any other way to contact you guys :]

Quoted 3 lines

Thanks
Emil

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 31 lines · Eric Engestrom
Quoted 30 lines · Emil Velikov
Quoted 5 lines · Eric Engestrom

Commit 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all the VK_PROTOTYPES to VK_NO_PROTOTYPES
This brings the Intel header in line with the rest of the Vulkan code.

Quoted 22 lines

---

This might break code that was using the old guard scheme (not sure how that could've worked anyway).
What the policy on this?

v2: rebase on top of 3caf2e89aa1711e80db80d2056e0a44663d9c7d2
("anv: fix build without Wayland platform"). Should've done that the first time around, sorry :]

 include/vulkan/vulkan_intel.h  | 2 +-
 src/intel/vulkan/anv_private.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
include/vulkan/vulkan_intel.h +0 -0
index 1f77128..8ede61b 100644
@@ -44,7 +44,7 @@ typedef struct VkDmaBufImageCreateInfo_
 
 typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage);
 
Quoted 9 lines
Quoted 5 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 48

Quoted 3 lines
include/vulkan/vulkan_intel.h +1 -1
-#ifdef VK_PROTOTYPES
+#ifndef VK_NO_PROTOTYPES
 

Would be great to hear from the Intel guys, if there is a another Cannonical repo where this change should land first ?

CC'ing intel-gfx even though this isn't X-related, because I don't know of any other way to contact you guys :]

Adding the anv authors.

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we want in mesa.

Thanks
Emil
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

#5 lore raw
Quoted 3 lines · PDT Emil Velikov
Quoted 2 lines · Eric Engestrom
Quoted 1 line · Emil Velikov

On 21 April 2016 at 11:24, Eric Engestrom <[email protected]>

Quoted 7 lines · wrote:
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines

Commit 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all the VK_PROTOTYPES to VK_NO_PROTOTYPES
This brings the Intel header in line with the rest of the Vulkan code.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

---

This might break code that was using the old guard scheme (not sure how that could've worked anyway).
What the policy on this?

v2: rebase on top of 3caf2e89aa1711e80db80d2056e0a44663d9c7d2
("anv: fix build without Wayland platform"). Should've done that

the

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

include/vulkan/

Quoted 7 lines

first time around, sorry :]

 include/vulkan/vulkan_intel.h  | 2 +-
 src/intel/vulkan/anv_private.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
include/vulkan/ renamed from include/vulkan/vulkan_intel.h +0 -0

vulkan_intel.h

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 45

Quoted 6 lines

index 1f77128..8ede61b 100644

include/vulkan/vulkan_intel.h +0 -0
@@ -44,7 +44,7 @@ typedef struct VkDmaBufImageCreateInfo_
 
 typedef VkResult (VKAPI_PTR *PFN_vkCreateDmaBufImageINTEL)(VkDevice 

device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage);

Quoted 10 lines
Quoted 10 lines
Quoted 6 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 47

Quoted 4 lines
include/vulkan/vulkan_intel.h +1 -1
-#ifdef VK_PROTOTYPES
+#ifndef VK_NO_PROTOTYPES
 

Would be great to hear from the Intel guys, if there is a another Cannonical repo where this change should land first ?

CC'ing intel-gfx even though this isn't X-related, because I don't know of any other way to contact you guys :]

Quoted 8 lines

Adding the anv authors.

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we want in mesa.

Thanks
Emil

I'm pretty sure Mesa is the only repository where this lives.

_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

#6 lore raw
Quoted 3 lines · Kenneth Graunke
Quoted 1 line · PDT Emil Velikov

On 28 April 2016 at 19:13, Eric Engestrom <[email protected]>

Quoted 6 lines · wrote:
Quoted 2 lines
Quoted 2 lines · Emil Velikov
Quoted 1 line

On 21 April 2016 at 11:24, Eric Engestrom <[email protected]>

Quoted 3 lines · wrote:
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

Commit 3d0fac7aca237bbe8ed8e2a362d3b42d0ef8c46c changed all the VK_PROTOTYPES to VK_NO_PROTOTYPES
This brings the Intel header in line with the rest of the Vulkan

code.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 2 lines
Quoted 3 lines

---

This might break code that was using the old guard scheme (not

sure how

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

that could've worked anyway).
What the policy on this?

v2: rebase on top of 3caf2e89aa1711e80db80d2056e0a44663d9c7d2
("anv: fix build without Wayland platform"). Should've done

that

Quoted 7 lines

the

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

first time around, sorry :]

 include/vulkan/vulkan_intel.h  | 2 +-
 src/intel/vulkan/anv_private.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

include/vulkan/

Quoted 1 line
include/vulkan/ renamed from include/vulkan/vulkan_intel.h +0 -0

vulkan_intel.h

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 45

Quoted 6 lines

index 1f77128..8ede61b 100644

include/vulkan/vulkan_intel.h +0 -0
@@ -44,7 +44,7 @@ typedef struct VkDmaBufImageCreateInfo_
 
 typedef VkResult (VKAPI_PTR

*PFN_vkCreateDmaBufImageINTEL)(VkDevice

Quoted 10 lines

device, const VkDmaBufImageCreateInfo* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDeviceMemory* pMem, VkImage* pImage);

Quoted 8 lines
Quoted 8 lines
Quoted 6 lines

include/vulkan/vulkan_intel.h typedef struct VkDmaBufImageCreateInfo_ · line 47

Quoted 4 lines
include/vulkan/vulkan_intel.h +1 -1
-#ifdef VK_PROTOTYPES
+#ifndef VK_NO_PROTOTYPES
 

Would be great to hear from the Intel guys, if there is a another Cannonical repo where this change should land first ?

CC'ing intel-gfx even though this isn't X-related, because I don't

know

Quoted 4 lines
Quoted 4 lines
Quoted 2 lines

of any other way to contact you guys :]

Adding the anv authors.

Quoted 8 lines
Quoted 6 lines

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we want in mesa.

Thanks
Emil

I'm pretty sure Mesa is the only repository where this lives.

Yup

_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

#7 lore raw
Quoted 8 lines · Jason Ekstrand
Quoted 7 lines · Kenneth Graunke
Quoted 6 lines · PDT Emil Velikov

Adding the anv authors.

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we want in mesa.

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

Thanks
Emil

I'm pretty sure Mesa is the only repository where this lives.

Yup

Ping?

I'm not sure why this didn't get at least an ACK from Intel, but I don't see any reason not to apply this fix.
I don't have commit access; Emil, can you do it?

Cheers,
Eric
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reviewed-by
#8 lore raw
Quoted 14 lines · Eric Engestrom
Quoted 13 lines · Jason Ekstrand
Quoted 11 lines · Kenneth Graunke
Quoted 8 lines · PDT Emil Velikov

Adding the anv authors.

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we want in mesa.

Thanks
Emil

I'm pretty sure Mesa is the only repository where this lives.

Quoted 7 lines
Quoted 1 line

Yup

Ping?

I'm not sure why this didn't get at least an ACK from Intel, but I don't see any reason not to apply this fix.
I don't have commit access; Emil, can you do it?

Bump. Jason, does this patch look good to you?

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 19 lines · Chad Versace
Quoted 2 lines · Eric Engestrom
Quoted 1 line · Jason Ekstrand

On May 1, 2016 6:04 PM, "Kenneth Graunke" <[email protected]>

Quoted 5 lines · wrote:
Quoted 5 lines
Quoted 5 lines · PDT Emil Velikov
Quoted 4 lines

Adding the anv authors.

Jason, Chad, is there a canonical place where changes to vulkan_intel.h should land first ? Eric has a nice fix which we

want

Quoted 9 lines
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

in mesa.

Thanks
Emil

I'm pretty sure Mesa is the only repository where this lives.

Yup

Quoted 8 lines
Quoted 5 lines

Ping?

I'm not sure why this didn't get at least an ACK from Intel, but I don't see any reason not to apply this fix.
I don't have commit access; Emil, can you do it?

Bump. Jason, does this patch look good to you?

Fine by me

Quoted 3 lines

_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev