From 1710d8d2cd8b73668c19bec9cad34e40b2aa68f8 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 11 Feb 2015 14:13:34 -0700 Subject: intel: Remove scissor enable and scissor count bug #12925 header version: r29511 Remove separate scissor enable and scissor count. Scissor always enabled and must always provide scissor rect for every viewport. --- include/xgl.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include/xgl.h') diff --git a/include/xgl.h b/include/xgl.h index 968ab232..e27b910d 100644 --- a/include/xgl.h +++ b/include/xgl.h @@ -33,7 +33,7 @@ #include "xglPlatform.h" // XGL API version supported by this file -#define XGL_API_VERSION XGL_MAKE_VERSION(0, 47, 1) +#define XGL_API_VERSION XGL_MAKE_VERSION(0, 48, 1) #ifdef __cplusplus extern "C" @@ -1919,7 +1919,6 @@ typedef struct _XGL_PIPELINE_VP_STATE_CREATE_INFO XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_PIPELINE_VP_STATE_CREATE_INFO const void* pNext; // Pointer to next structure uint32_t numViewports; - uint32_t scissorEnable; XGL_COORDINATE_ORIGIN clipOrigin; // optional (GL45) XGL_DEPTH_MODE depthMode; // optional (GL45) } XGL_PIPELINE_VP_STATE_CREATE_INFO; @@ -2033,9 +2032,8 @@ typedef struct _XGL_DYNAMIC_VP_STATE_CREATE_INFO { XGL_STRUCTURE_TYPE sType; // Must be XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO const void* pNext; // Pointer to next structure - uint32_t viewportCount; // number of entries in pViewports + uint32_t viewportAndScissorCount; // number of entries in pViewports and pScissors const XGL_VIEWPORT* pViewports; - uint32_t scissorCount; // number of entries in pScissors const XGL_RECT* pScissors; } XGL_DYNAMIC_VP_STATE_CREATE_INFO; -- cgit v1.2.3