Commits

Jason McKesson  committed 1752600 Merge

Merge with spec-mods

  • Participants
  • Parent commits 8ac8eff, 70680d1

Comments (0)

Files changed (2)

File glspecs/enum.spec

 	MAX_SHADER_STORAGE_BUFFER_BINDINGS		= 0x90DD
 	MAX_SHADER_STORAGE_BLOCK_SIZE			= 0x90DE
 	SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT		= 0x90DF
-	MAX_COMBINED_SHADER_OUTPUT_RESOURCES		= MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
+	MAX_COMBINED_SHADER_OUTPUT_RESOURCES		= GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
 	use ARB_shader_image_load_store			MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
 
 EXT_x11_sync_object enum:

File glspecs/enumext.spec

 	MAX_SHADER_STORAGE_BLOCK_SIZE			= 0x90DE
 	SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT		= 0x90DF
 	SHADER_STORAGE_BARRIER_BIT			= 0x2000
-	MAX_COMBINED_SHADER_OUTPUT_RESOURCES		= MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
+	MAX_COMBINED_SHADER_OUTPUT_RESOURCES		= GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
 	use ARB_shader_image_load_store			MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS
 
 ###############################################################################