Permalink
Browse files

Add new logging for new compute/tess shader types + fix C++11 compiling

1 parent 14a97ee commit 8726f66a8330250d74c4e45dfcac1a8db3d8007c @dtrebilco committed Aug 23, 2016
Showing with 1,288 additions and 202 deletions.
  1. +77 −8 3rdParty/HeaderGen/egl.xml
  2. +639 −21 3rdParty/HeaderGen/gl.xml
  3. +14 −2 3rdParty/HeaderGen/glx.xml
  4. +1 −1 3rdParty/HeaderGen/wgl.xml
  5. +5 −5 3rdParty/Install/installScript.iss
  6. +5 −5 3rdParty/Install/installScriptx64.iss
  7. +5 −5 Bin/GLFunctions/GLCore/GLCore3_0_Include.h
  8. +7 −7 Bin/GLFunctions/GLCore/GLCore3_1_Include.h
  9. +2 −2 Bin/GLFunctions/GLCore/GLCore3_3_Include.h
  10. +7 −7 Bin/GLFunctions/GLCore/GLCore4_0_Include.h
  11. +55 −55 Bin/GLFunctions/GLCore/GLCore4_1_Include.h
  12. +1 −1 Bin/GLFunctions/GLCore/GLCore4_2_Include.h
  13. +7 −7 Bin/GLFunctions/GLCore/GLCore4_3_Include.h
  14. +4 −4 Bin/GLFunctions/GLCore/GLCore4_5_Include.h
  15. +9 −0 Bin/GLFunctions/Misc/EXT_protected_textures_Include.h
  16. +13 −0 Bin/GLFunctions/Misc/EXT_shader_pixel_local_storage2_Include.h
  17. +14 −0 Bin/GLFunctions/Misc/EXT_window_rectangles_Include.h
  18. +13 −0 Bin/GLFunctions/Misc/IMG_framebuffer_downsample_Include.h
  19. +8 −0 Bin/GLFunctions/Misc/INTEL_conservative_rasterization_Include.h
  20. +11 −0 Bin/GLFunctions/NV/NV_clip_space_w_scaling_Include.h
  21. +11 −0 Bin/GLFunctions/NV/NV_conservative_raster_pre_snap_triangles_Include.h
  22. +8 −0 Bin/GLFunctions/NV/NV_robustness_video_memory_purge_Include.h
  23. +20 −0 Bin/GLFunctions/NV/NV_viewport_swizzle_Include.h
  24. +9 −0 Bin/GLFunctions/gliIncludes.h
  25. +2 −1 Bin/Profiles/gliConfig_AuthorStd.xni
  26. +6 −0 Docs/version_info.txt
  27. +10 −10 Src/Common/FileUtils.cpp
  28. +3 −3 Src/Common/FileUtils.h
  29. +2 −0 Src/MainLib/GLDefines.h
  30. +2 −2 Src/MainLib/GLDriver.cpp
  31. +36 −0 Src/MainLib/GLIntercept.vcproj
  32. +2 −2 Src/MainLib/GLInterceptConfig.h
  33. +146 −24 Src/MainLib/InterceptShaderGLSL.cpp
  34. +4 −1 Src/MainLib/InterceptShaderGLSL.h
  35. +9 −0 Src/MainLib/ShaderGLSLManager.cpp
  36. +3 −0 Src/MainLib/ShaderGLSLSaveManager.cpp
  37. +69 −23 Src/Plugins/GLShaderEdit/ShaderEditGLSL.cpp
  38. +3 −1 Src/Plugins/GLShaderEdit/ShaderEditGLSL.h
  39. +12 −0 Src/Plugins/GLShaderEdit/ShaderManagerGLSL.h
  40. +15 −0 Src/Plugins/GLShaderEdit/ShaderUtilsGLSL.cpp
  41. +11 −0 Src/Plugins/GLShaderEdit/ShaderUtilsGLSL.h
  42. +8 −5 Src/Plugins/GLShaderEdit/UniqueShaderID.h
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<registry>
<!--
- Copyright (c) 2013-2014 The Khronos Group Inc.
+ Copyright (c) 2013-2016 The Khronos Group Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and/or associated documentation files (the
@@ -76,6 +76,7 @@
<type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLTimeNV</name>;</type>
<type requires="khrplatform">typedef khronos_utime_nanoseconds_t <name>EGLuint64NV</name>;</type>
<type requires="khrplatform">typedef khronos_uint64_t <name>EGLuint64KHR</name>;</type>
+ <type requires="khrplatform">typedef khronos_stime_nanoseconds_t <name>EGLnsecsANDROID</name>;</type>
<type>typedef int <name>EGLNativeFileDescriptorKHR</name>;</type>
<type requires="khrplatform">typedef khronos_ssize_t <name>EGLsizeiANDROID</name>;</type>
<type requires="EGLsizeiANDROID">typedef void (*<name>EGLSetBlobFuncANDROID</name>) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize);</type>
@@ -112,6 +113,7 @@
<!--
<enum value="0x0800" name="EGL_STREAM_BIT_NV" comment="Draft EGL_NV_stream_producer_eglsurface extension (bug 8064)"/>
-->
+ <enum value="0x1000" name="EGL_MUTABLE_RENDER_BUFFER_BIT_KHR"/>
</enums>
<enums namespace="EGLRenderableTypeMask" type="bitmask" comment="EGL_RENDERABLE_TYPE bits">
@@ -130,6 +132,12 @@
<enum value="0x0002" name="EGL_WRITE_SURFACE_BIT_KHR"/>
</enums>
+ <enums namespace="EGLNativeBufferUsageFlags" type="bitmask" comment="EGL_NATIVE_BUFFER_USAGE_ANDROID bits">
+ <enum value="0x00000001" name="EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID"/>
+ <enum value="0x00000002" name="EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID"/>
+ <enum value="0x00000004" name="EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID"/>
+ </enums>
+
<enums namespace="EGLSyncFlagsKHR" type="bitmask" comment="Fence/reusable sync wait bits">
<enum value="0x0001" name="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
<enum value="0x0001" name="EGL_SYNC_FLUSH_COMMANDS_BIT_KHR" alias="EGL_SYNC_FLUSH_COMMANDS_BIT"/>
@@ -356,7 +364,7 @@
<enum value="0x30BD" name="EGL_GL_TEXTURE_ZOFFSET"/>
<enum value="0x30BD" name="EGL_GL_TEXTURE_ZOFFSET_KHR" alias="EGL_GL_TEXTURE_ZOFFSET"/>
<enum value="0x30BE" name="EGL_POST_SUB_BUFFER_SUPPORTED_NV"/>
- <enum value="0x30BF" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT" alias="EGL_CONTEXT_OPENGL_ROBUST_ACCESS"/>
+ <enum value="0x30BF" name="EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT"/>
</enums>
<enums namespace="EGL" start="0x30C0-0x30CF" vendor="KHR">
@@ -441,7 +449,10 @@
<enum value="0x3101" name="EGL_CONTEXT_PRIORITY_HIGH_IMG"/>
<enum value="0x3102" name="EGL_CONTEXT_PRIORITY_MEDIUM_IMG"/>
<enum value="0x3103" name="EGL_CONTEXT_PRIORITY_LOW_IMG"/>
- <unused start="0x3104" end="0x310F"/>
+ <unused start="0x3104"/>
+ <enum value="0x3105" name="EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG"/>
+ <enum value="0x3106" name="EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG"/>
+ <unused start="0x3107" end="0x310F"/>
</enums>
<enums namespace="EGL" start="0x3110" end="0x311F" vendor="ATX" comment="Reserved for Tim Renouf, Antix (Khronos bug 4949)">
@@ -474,12 +485,14 @@
<enum value="0x3140" name="EGL_NATIVE_BUFFER_ANDROID"/>
<enum value="0x3141" name="EGL_PLATFORM_ANDROID_KHR"/>
<enum value="0x3142" name="EGL_RECORDABLE_ANDROID"/>
- <unused start="0x3143"/>
+ <enum value="0x3143" name="EGL_NATIVE_BUFFER_USAGE_ANDROID"/>
<enum value="0x3144" name="EGL_SYNC_NATIVE_FENCE_ANDROID"/>
<enum value="0x3145" name="EGL_SYNC_NATIVE_FENCE_FD_ANDROID"/>
<enum value="0x3146" name="EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID"/>
<enum value="0x3147" name="EGL_FRAMEBUFFER_TARGET_ANDROID"/>
- <unused start="0x3148" end="0x314F"/>
+ <unused start="0x3148" end="0x314B"/>
+ <enum value="0x314C" name="EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID"/>
+ <unused start="0x314D" end="0x314F"/>
</enums>
<enums namespace="EGL" start="0x3150" end="0x315F" vendor="NOK" comment="Reserved for Robert Palmer (Khronos bug 5368)">
@@ -719,7 +732,9 @@
<enum value="0x332C" name="EGL_YUV_PLANE0_TEXTURE_UNIT_NV"/>
<enum value="0x332D" name="EGL_YUV_PLANE1_TEXTURE_UNIT_NV"/>
<enum value="0x332E" name="EGL_YUV_PLANE2_TEXTURE_UNIT_NV"/>
- <unused start="0x332F" end="0x339F"/>
+ <unused start="0x332F" end="0x334B"/>
+ <enum value="0x334C" name="EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV"/>
+ <unused start="0x334D" end="0x339F"/>
</enums>
<enums namespace="EGL" start="0x33A0" end="0x33AF" vendor="ANGLE" comment="Reserved for Shannon Woods (Bug 13175)">
@@ -753,6 +768,10 @@
<unused start="0x33E0" end="0x342F"/>
</enums>
+ <enums namespace="EGL" start="0x3430" end="0x343F" vendor="ANDROID" comment="Reserved for Pablo Ceballos (Bug 15874)">
+ <unused start="0x3430" end="0x343F"/>
+ </enums>
+
<!-- Please remember that new enumerant allocations must be obtained by
request to the Khronos API registrar (see comments at the top of this
file) File requests in the Khronos Bugzilla, EGL project, Registry
@@ -762,8 +781,8 @@
<!-- Reservable for future use. To generate a new range, allocate multiples
of 16 starting at the lowest available point in this block. -->
- <enums namespace="EGL" start="0x3420" end="0x3FFF" vendor="KHR">
- <unused start="0x3420" end="0x3FFF" comment="Reserved for future use"/>
+ <enums namespace="EGL" start="0x3440" end="0x3FFF" vendor="KHR">
+ <unused start="0x3440" end="0x3FFF" comment="Reserved for future use"/>
</enums>
<enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
@@ -856,6 +875,10 @@
<param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
</command>
<command>
+ <proto><ptype>EGLClientBuffer</ptype> <name>eglCreateNativeClientBufferANDROID</name></proto>
+ <param>const <ptype>EGLint</ptype> *<name>attrib_list</name></param>
+ </command>
+ <command>
<proto><ptype>EGLSurface</ptype> <name>eglCreatePbufferFromClientBuffer</name></proto>
<param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
<param><ptype>EGLenum</ptype> <name>buftype</name></param>
@@ -1183,6 +1206,12 @@
<param><ptype>EGLint</ptype> <name>height</name></param>
</command>
<command>
+ <proto><ptype>EGLBoolean</ptype> <name>eglPresentationTimeANDROID</name></proto>
+ <param><ptype>EGLDisplay</ptype> <name>dpy</name></param>
+ <param><ptype>EGLSurface</ptype> <name>surface</name></param>
+ <param><ptype>EGLnsecsANDROID</ptype> <name>time</name></param>
+ </command>
+ <command>
<proto><ptype>EGLenum</ptype> <name>eglQueryAPI</name></proto>
</command>
<command>
@@ -1751,11 +1780,25 @@
<command name="eglSetBlobCacheFuncsANDROID"/>
</require>
</extension>
+ <extension name="EGL_ANDROID_create_native_client_buffer" supported="egl">
+ <require>
+ <enum name="EGL_NATIVE_BUFFER_USAGE_ANDROID"/>
+ <enum name="EGL_NATIVE_BUFFER_USAGE_PROTECTED_BIT_ANDROID"/>
+ <enum name="EGL_NATIVE_BUFFER_USAGE_RENDERBUFFER_BIT_ANDROID"/>
+ <enum name="EGL_NATIVE_BUFFER_USAGE_TEXTURE_BIT_ANDROID"/>
+ <command name="eglCreateNativeClientBufferANDROID"/>
+ </require>
+ </extension>
<extension name="EGL_ANDROID_framebuffer_target" supported="egl">
<require>
<enum name="EGL_FRAMEBUFFER_TARGET_ANDROID"/>
</require>
</extension>
+ <extension name="EGL_ANDROID_front_buffer_auto_refresh" supported="egl">
+ <require>
+ <enum name="EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID"/>
+ </require>
+ </extension>
<extension name="EGL_ANDROID_image_native_buffer" supported="egl">
<require>
<enum name="EGL_NATIVE_BUFFER_ANDROID"/>
@@ -1770,6 +1813,11 @@
<command name="eglDupNativeFenceFDANDROID"/>
</require>
</extension>
+ <extension name="EGL_ANDROID_presentation_time" supported="egl">
+ <require>
+ <command name="eglPresentationTimeANDROID"/>
+ </require>
+ </extension>
<extension name="EGL_ANDROID_recordable" supported="egl">
<require>
<enum name="EGL_RECORDABLE_ANDROID"/>
@@ -1942,6 +1990,11 @@
<enum name="EGL_PLATFORM_X11_SCREEN_EXT"/>
</require>
</extension>
+ <extension name="EGL_EXT_protected_content" supported="egl">
+ <require>
+ <enum name="EGL_PROTECTED_CONTENT_EXT"/>
+ </require>
+ </extension>
<extension name="EGL_EXT_protected_surface" supported="egl">
<require>
<enum name="EGL_PROTECTED_CONTENT_EXT"/>
@@ -2008,6 +2061,12 @@
<enum name="EGL_CONTEXT_PRIORITY_LOW_IMG"/>
</require>
</extension>
+ <extension name="EGL_IMG_image_plane_attribs" supported="egl">
+ <require>
+ <enum name="EGL_NATIVE_BUFFER_MULTIPLANE_SEPARATE_IMG"/>
+ <enum name="EGL_NATIVE_BUFFER_PLANE_OFFSET_IMG"/>
+ </require>
+ </extension>
<extension name="EGL_KHR_cl_event" supported="egl">
<require>
<enum name="EGL_CL_EVENT_HANDLE_KHR"/>
@@ -2205,6 +2264,11 @@
<command name="eglQuerySurface64KHR"/>
</require>
</extension>
+ <extension name="EGL_KHR_mutable_render_buffer" supported="egl">
+ <require>
+ <enum name="EGL_MUTABLE_RENDER_BUFFER_BIT_KHR"/>
+ </require>
+ </extension>
<extension name="EGL_KHR_partial_update" supported="egl">
<require>
<enum name="EGL_BUFFER_AGE_KHR"/>
@@ -2414,6 +2478,11 @@
<command name="eglPostSubBufferNV"/>
</require>
</extension>
+ <extension name="EGL_NV_robustness_video_memory_purge" supported="egl">
+ <require>
+ <enum name="EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV"/>
+ </require>
+ </extension>
<extension name="EGL_NV_stream_consumer_gltexture_yuv" supported="egl">
<require>
<enum name="EGL_YUV_PLANE0_TEXTURE_UNIT_NV"/>
Oops, something went wrong.

0 comments on commit 8726f66

Please sign in to comment.