<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, May 18, 2018 at 3:06 AM, Timothy Arceri <span dir="ltr"><<a href="mailto:tarceri@itsqueeze.com" target="_blank">tarceri@itsqueeze.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Just let the extension detection do its job as we will be adding<br>
compat profile support in future, also we want these to work<br>
with compat profile version overrides.<br>
---<br>
 src/mesa/main/get_hash_params.<wbr>py | 21 +++++++--------------<br>
 1 file changed, 7 insertions(+), 14 deletions(-)<br>
<br>
diff --git a/src/mesa/main/get_hash_<wbr>params.py b/src/mesa/main/get_hash_<wbr>params.py<br>
index a97b948a791..9f51d00f38c 100644<br>
--- a/src/mesa/main/get_hash_<wbr>params.py<br>
+++ b/src/mesa/main/get_hash_<wbr>params.py<br>
@@ -451,6 +451,11 @@ descriptor=[<br>
   [ "MAX_WINDOW_RECTANGLES_EXT", "CONTEXT_INT(Const.<wbr>MaxWindowRectangles), extra_EXT_window_rectangles" ],<br>
   [ "NUM_WINDOW_RECTANGLES_EXT", "CONTEXT_INT(Scissor.<wbr>NumWindowRects), extra_EXT_window_rectangles" ],<br>
   [ "WINDOW_RECTANGLE_MODE_EXT", "CONTEXT_ENUM16(Scissor.<wbr>WindowRectMode), extra_EXT_window_rectangles" ],<br>
+<br>
+  # GL_ARB_gpu_shader5 / GL_OES_shader_multisample_<wbr>interpolation<br>
+  [ "MIN_FRAGMENT_INTERPOLATION_<wbr>OFFSET", "CONTEXT_FLOAT(Const.<wbr>MinFragmentInterpolationOffset<wbr>), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
+  [ "MAX_FRAGMENT_INTERPOLATION_<wbr>OFFSET", "CONTEXT_FLOAT(Const.<wbr>MaxFragmentInterpolationOffset<wbr>), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
+  [ "FRAGMENT_INTERPOLATION_<wbr>OFFSET_BITS", "CONST(FRAGMENT_INTERPOLATION_<wbr>OFFSET_BITS), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
 ]},<br>
<br>
 { "apis": ["GLES", "GLES2"], "params": [<br>
@@ -558,18 +563,7 @@ descriptor=[<br>
<br>
   # GL_NUM_SHADING_LANGUAGE_<wbr>VERSIONS<br>
   [ "NUM_SHADING_LANGUAGE_<wbr>VERSIONS", "LOC_CUSTOM, TYPE_INT, 0, extra_version_43" ],<br>
-]},<br>
<br>
-# Enums in OpenGL Core profile and ES 3.0<br>
-{ "apis": ["GL_CORE", "GLES3"], "params": [<br>
-  # GL_ARB_gpu_shader5 / GL_OES_shader_multisample_<wbr>interpolation<br>
-  [ "MIN_FRAGMENT_INTERPOLATION_<wbr>OFFSET", "CONTEXT_FLOAT(Const.<wbr>MinFragmentInterpolationOffset<wbr>), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
-  [ "MAX_FRAGMENT_INTERPOLATION_<wbr>OFFSET", "CONTEXT_FLOAT(Const.<wbr>MaxFragmentInterpolationOffset<wbr>), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
-  [ "FRAGMENT_INTERPOLATION_<wbr>OFFSET_BITS", "CONST(FRAGMENT_INTERPOLATION_<wbr>OFFSET_BITS), extra_ARB_gpu_shader5_or_OES_<wbr>sample_variables" ],<br>
-]},<br>
-<br>
-# Enums in OpenGL Core profile and ES 3.1<br>
-{ "apis": ["GL_CORE", "GLES31"], "params": [<br>
 # GL_ARB_draw_indirect / GLES 3.1<br>
   [ "DRAW_INDIRECT_BUFFER_BINDING"<wbr>, "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_draw_indirect" ],<br>
<br>
@@ -650,12 +644,11 @@ descriptor=[<br>
   [ "CONSERVATIVE_RASTERIZATION_<wbr>INTEL", "CONTEXT_BOOL(<wbr>IntelConservativeRasterization<wbr>), extra_INTEL_conservative_<wbr>rasterization" ],<br>
 ]},<br>
<br>
-{ "apis": ["GL_CORE", "GLES32"], "params": [<br>
+# Enums in OpenGL and ES 3.2<br>
+{ "apis": ["GL", "GL_CORE", "GLES32"], "params": [<br>
   [ "MULTISAMPLE_LINE_WIDTH_RANGE_<wbr>ARB", "CONTEXT_FLOAT2(Const.<wbr>MinLineWidthAA), extra_ES32" ],<br>
   [ "MULTISAMPLE_LINE_WIDTH_<wbr>GRANULARITY_ARB", "CONTEXT_FLOAT(Const.<wbr>LineWidthGranularity), extra_ES32" ],<br>
-]},<br>
<br>
-{ "apis": ["GL", "GL_CORE", "GLES32"], "params": [<br>
 # GL 3.0 or ES 3.2<br>
   [ "CONTEXT_FLAGS", "CONTEXT_INT(Const.<wbr>ContextFlags), extra_version_30" ],<br>
 ]},<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.17.0<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>