Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/xorg]: xsrc/external/mit/MesaLib/dist/src/mesa Import mesa 19.1.7
details: https://anonhg.NetBSD.org/xsrc/rev/e13882f8f6ac
branches: xorg
changeset: 10384:e13882f8f6ac
user: maya <maya%NetBSD.org@localhost>
date: Tue Sep 24 18:11:06 2019 +0000
description:
Import mesa 19.1.7
New features in mesa 19.1.0:
GL_ARB_parallel_shader_compile on all drivers.
GL_EXT_gpu_shader4 on all GL 3.1 drivers.
GL_EXT_shader_image_load_formatted on radeonsi.
GL_EXT_texture_buffer_object on all GL 3.1 drivers.
GL_EXT_texture_compression_s3tc_srgb on Gallium drivers and i965 (ES extension).
GL_NV_compute_shader_derivatives on iris and i965.
GL_KHR_parallel_shader_compile on all drivers.
VK_EXT_buffer_device_address on Intel and RADV.
VK_EXT_depth_clip_enable on Intel and RADV.
VK_KHR_ycbcr_image_arrays on Intel.
VK_EXT_inline_uniform_block on Intel and RADV.
VK_EXT_external_memory_host on Intel.
VK_EXT_host_query_reset on Intel and RADV.
VK_KHR_surface_protected_capabilities on Intel and RADV.
VK_EXT_pipeline_creation_feedback on Intel and RADV.
VK_KHR_8bit_storage on RADV.
VK_AMD_gpu_shader_int16 on RADV.
VK_AMD_gpu_shader_half_float on RADV.
VK_NV_compute_shader_derivatives on Intel.
VK_KHR_shader_float16_int8 on Intel and RADV (RADV only supports int8).
VK_KHR_shader_atomic_int64 on Intel.
VK_EXT_descriptor_indexing on Intel.
VK_KHR_shader_float16_int8 on Intel and RADV.
GL_INTEL_conservative_rasterization on iris.
VK_EXT_memory_budget on Intel.
New features in mesa 19.0.0:
GL_AMD_texture_texture4 on all GL 4.0 drivers.
GL_EXT_shader_implicit_conversions on all drivers (ES extension).
GL_EXT_texture_compression_bptc on all GL 4.0 drivers (ES extension).
GL_EXT_texture_compression_rgtc on all GL 3.0 drivers (ES extension).
GL_EXT_render_snorm on gallium drivers (ES extension).
GL_EXT_texture_view on drivers supporting texture views (ES extension).
GL_OES_texture_view on drivers supporting texture views (ES extension).
GL_NV_shader_atomic_float on nvc0 (Fermi/Kepler only).
Shader-based software implementations of GL_ARB_gpu_shader_fp64, GL_ARB_gpu_shader_int64, GL_ARB_vertex_attrib_64bit, and GL_ARB_shader_ballot on i965.
VK_ANDROID_external_memory_android_hardware_buffer on Intel
Fixed and re-exposed VK_EXT_pci_bus_info on Intel and RADV
VK_EXT_scalar_block_layout on Intel and RADV
VK_KHR_depth_stencil_resolve on Intel
VK_KHR_draw_indirect_count on Intel
VK_EXT_conditional_rendering on Intel
VK_EXT_memory_budget on RADV
Also, bug fixes.
diffstat:
external/mit/MesaLib/dist/src/mesa/main/format_utils.h | 2 +-
external/mit/MesaLib/dist/src/mesa/main/formatquery.c | 2 +-
external/mit/MesaLib/dist/src/mesa/main/formats.c | 5 +
external/mit/MesaLib/dist/src/mesa/main/formats.csv | 6 +
external/mit/MesaLib/dist/src/mesa/main/formats.h | 8 +
external/mit/MesaLib/dist/src/mesa/main/framebuffer.c | 2 +-
external/mit/MesaLib/dist/src/mesa/main/get.c | 45 +-
external/mit/MesaLib/dist/src/mesa/main/get_hash_generator.py | 9 +-
external/mit/MesaLib/dist/src/mesa/main/get_hash_params.py | 49 +-
external/mit/MesaLib/dist/src/mesa/main/glformats.c | 268 +++--
external/mit/MesaLib/dist/src/mesa/main/glformats.h | 6 +-
external/mit/MesaLib/dist/src/mesa/main/glheader.h | 12 +
external/mit/MesaLib/dist/src/mesa/main/glspirv.c | 6 +-
external/mit/MesaLib/dist/src/mesa/main/glthread.c | 7 +-
external/mit/MesaLib/dist/src/mesa/main/glthread.h | 2 +-
external/mit/MesaLib/dist/src/mesa/main/hint.c | 12 +
external/mit/MesaLib/dist/src/mesa/main/hint.h | 4 +
external/mit/MesaLib/dist/src/mesa/main/marshal.c | 2 +-
external/mit/MesaLib/dist/src/mesa/main/menums.h | 24 -
external/mit/MesaLib/dist/src/mesa/main/mtypes.h | 72 +-
external/mit/MesaLib/dist/src/mesa/main/pipelineobj.c | 16 +-
external/mit/MesaLib/dist/src/mesa/main/program_binary.c | 4 +
external/mit/MesaLib/dist/src/mesa/main/queryobj.c | 113 +-
external/mit/MesaLib/dist/src/mesa/main/shader_query.cpp | 2 +-
external/mit/MesaLib/dist/src/mesa/main/shaderapi.c | 32 +-
external/mit/MesaLib/dist/src/mesa/main/shaderimage.c | 10 +
external/mit/MesaLib/dist/src/mesa/main/shaderimage.h | 3 +
external/mit/MesaLib/dist/src/mesa/main/shaderobj.h | 4 +
external/mit/MesaLib/dist/src/mesa/main/tests/dispatch_sanity.cpp | 15 +-
external/mit/MesaLib/dist/src/mesa/main/tests/meson.build | 3 +-
external/mit/MesaLib/dist/src/mesa/main/texcompress.c | 49 +
external/mit/MesaLib/dist/src/mesa/main/texformat.c | 3 +
external/mit/MesaLib/dist/src/mesa/main/teximage.c | 11 +-
external/mit/MesaLib/dist/src/mesa/main/texobj.c | 38 +-
external/mit/MesaLib/dist/src/mesa/main/textureview.c | 1 +
external/mit/MesaLib/dist/src/mesa/main/varray.c | 151 +-
external/mit/MesaLib/dist/src/mesa/main/varray.h | 31 +-
external/mit/MesaLib/dist/src/mesa/main/version.c | 12 +-
external/mit/MesaLib/dist/src/mesa/program/Android.mk | 20 +-
external/mit/MesaLib/dist/src/mesa/program/arbprogparse.c | 4 +-
external/mit/MesaLib/dist/src/mesa/program/ir_to_mesa.cpp | 53 +-
external/mit/MesaLib/dist/src/mesa/program/ir_to_mesa.h | 3 +-
external/mit/MesaLib/dist/src/mesa/program/prog_parameter.c | 8 +-
external/mit/MesaLib/dist/src/mesa/program/prog_parameter.h | 31 +
external/mit/MesaLib/dist/src/mesa/program/prog_to_nir.c | 87 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom.c | 2 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom.h | 25 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_array.c | 154 ++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_atomicbuf.c | 2 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_blend.c | 58 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_framebuffer.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_msaa.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_rasterizer.c | 3 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_scissor.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_shader.c | 11 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_storagebuf.c | 5 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_atom_viewport.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_bitmap.c | 28 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_blit.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_bufferobjects.c | 9 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_clear.c | 99 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_compute.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_copyimage.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_drawpixels.c | 265 ++++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_drawpixels.h | 3 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_drawtex.c | 74 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_eglimage.c | 11 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_fbo.c | 39 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_fbo.h | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_feedback.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_flush.c | 39 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_memoryobjects.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_perfmon.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_program.c | 62 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_queryobj.c | 155 ++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_rasterpos.c | 5 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_readpixels.c | 3 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_semaphoreobjects.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_texture.c | 110 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_cb_texturebarrier.c | 34 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_context.c | 466 +++++++--
external/mit/MesaLib/dist/src/mesa/state_tracker/st_context.h | 161 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_debug.c | 2 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_draw.c | 41 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_draw_feedback.c | 154 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_extensions.c | 135 ++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_extensions.h | 3 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_format.c | 26 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_gen_mipmap.c | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_ir.cpp | 172 +++
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_ir.h | 36 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_nir.cpp | 318 ++++--
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 238 +---
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_tgsi.h | 10 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_to_tgsi_private.h | 1 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_types.cpp | 25 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_glsl_types.h | 4 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_manager.c | 114 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_manager.h | 6 +
external/mit/MesaLib/dist/src/mesa/state_tracker/st_mesa_to_tgsi.c | 4 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_nir.h | 27 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_nir_builtins.c | 144 +++
external/mit/MesaLib/dist/src/mesa/state_tracker/st_nir_lower_builtin.c | 6 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_nir_lower_tex_src_plane.c | 8 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_pbo.c | 204 ++++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_program.c | 214 +++-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_sampler_view.c | 64 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_sampler_view.h | 7 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_shader_cache.c | 3 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_texture.h | 25 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_tgsi_lower_yuv.c | 48 +-
external/mit/MesaLib/dist/src/mesa/state_tracker/st_util.h | 114 ++
external/mit/MesaLib/dist/src/mesa/state_tracker/tests/meson.build | 8 +-
external/mit/MesaLib/dist/src/mesa/swrast/s_fragprog.c | 4 +-
external/mit/MesaLib/dist/src/mesa/swrast/s_span.c | 2 +-
external/mit/MesaLib/dist/src/mesa/swrast/s_texfetch.c | 7 +-
external/mit/MesaLib/dist/src/mesa/swrast/s_texfetch_tmp.h | 1 +
external/mit/MesaLib/dist/src/mesa/tnl/t_draw.c | 22 +-
external/mit/MesaLib/dist/src/mesa/tnl/t_split_copy.c | 25 +-
119 files changed, 3746 insertions(+), 1559 deletions(-)
diffs (truncated from 10222 to 300 lines):
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/format_utils.h
--- a/external/mit/MesaLib/dist/src/mesa/main/format_utils.h Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/format_utils.h Tue Sep 24 18:11:06 2019 +0000
@@ -87,7 +87,7 @@
else if (x > 1.0f)
return MAX_UINT(dst_bits);
else
- return _mesa_lroundevenf(x * MAX_UINT(dst_bits));
+ return _mesa_i64roundevenf(x * MAX_UINT(dst_bits));
}
static inline unsigned
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/formatquery.c
--- a/external/mit/MesaLib/dist/src/mesa/main/formatquery.c Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/formatquery.c Tue Sep 24 18:11:06 2019 +0000
@@ -1241,7 +1241,7 @@
break;
case GL_SRGB_WRITE:
- if (!_mesa_has_EXT_framebuffer_sRGB(ctx) ||
+ if (!ctx->Extensions.EXT_sRGB ||
!_mesa_is_color_format(internalformat)) {
goto end;
}
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/formats.c
--- a/external/mit/MesaLib/dist/src/mesa/main/formats.c Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/formats.c Tue Sep 24 18:11:06 2019 +0000
@@ -712,11 +712,14 @@
case MESA_FORMAT_ETC1_RGB8:
case MESA_FORMAT_ETC2_RGB8:
case MESA_FORMAT_ETC2_SRGB8:
+ case MESA_FORMAT_ATC_RGB:
return MESA_FORMAT_BGR_UNORM8;
case MESA_FORMAT_ETC2_RGBA8_EAC:
case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC:
case MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1:
case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
+ case MESA_FORMAT_ATC_RGBA_EXPLICIT:
+ case MESA_FORMAT_ATC_RGBA_INTERPOLATED:
return MESA_FORMAT_A8B8G8R8_UNORM;
case MESA_FORMAT_ETC2_R11_EAC:
case MESA_FORMAT_ETC2_SIGNED_R11_EAC:
@@ -1108,6 +1111,7 @@
*comps = 4;
return;
case MESA_FORMAT_L_SRGB8:
+ case MESA_FORMAT_R_SRGB8:
*datatype = GL_UNSIGNED_BYTE;
*comps = 1;
return;
@@ -1670,6 +1674,7 @@
(type == GL_UNSIGNED_SHORT_8_8_REV_MESA && littleEndian != swapBytes));
case MESA_FORMAT_R_UNORM8:
+ case MESA_FORMAT_R_SRGB8:
return format == GL_RED && type == GL_UNSIGNED_BYTE;
case MESA_FORMAT_R8G8_UNORM:
return format == GL_RG && type == GL_UNSIGNED_BYTE && littleEndian;
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/formats.csv
--- a/external/mit/MesaLib/dist/src/mesa/main/formats.csv Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/formats.csv Tue Sep 24 18:11:06 2019 +0000
@@ -158,6 +158,7 @@
MESA_FORMAT_A8L8_SRGB , packed, 1, 1, 1, un8 , un8 , , , yyyx, srgb
# Array sRGB formats
+MESA_FORMAT_R_SRGB8 , array , 1, 1, 1, un8 , , , , x001, srgb
MESA_FORMAT_L_SRGB8 , array , 1, 1, 1, un8 , , , , xxx1, srgb
MESA_FORMAT_BGR_SRGB8 , array , 1, 1, 1, un8 , un8 , un8 , , zyx1, srgb
@@ -371,3 +372,8 @@
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5 , astc , 6, 5, 5, x128, , , , xyzw, srgb
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5 , astc , 6, 6, 5, x128, , , , xyzw, srgb
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6 , astc , 6, 6, 6, x128, , , , xyzw, srgb
+
+# ATC compressed formats
+MESA_FORMAT_ATC_RGB , atc , 4, 4, 1, x64 , , , , xyz1, rgb
+MESA_FORMAT_ATC_RGBA_EXPLICIT , atc , 4, 4, 1, x128, , , , xyzw, rgb
+MESA_FORMAT_ATC_RGBA_INTERPOLATED , atc , 4, 4, 1, x128, , , , xyzw, rgb
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/formats.h
--- a/external/mit/MesaLib/dist/src/mesa/main/formats.h Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/formats.h Tue Sep 24 18:11:06 2019 +0000
@@ -71,6 +71,7 @@
MESA_FORMAT_LAYOUT_ETC2,
MESA_FORMAT_LAYOUT_BPTC,
MESA_FORMAT_LAYOUT_ASTC,
+ MESA_FORMAT_LAYOUT_ATC,
MESA_FORMAT_LAYOUT_OTHER,
};
@@ -440,6 +441,7 @@
MESA_FORMAT_X8B8G8R8_SRGB, /* RRRR RRRR GGGG GGGG BBBB BBBB xxxx xxxx */
MESA_FORMAT_L8A8_SRGB, /* AAAA AAAA LLLL LLLL */
MESA_FORMAT_A8L8_SRGB, /* LLLL LLLL AAAA AAAA */
+ MESA_FORMAT_R_SRGB8, /* RRRR RRRR */
/* Array sRGB formats */
MESA_FORMAT_L_SRGB8, /* ubyte[i] = L */
@@ -656,6 +658,12 @@
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5x5,
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x5,
MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6x6,
+
+ /* ATC compressed formats */
+ MESA_FORMAT_ATC_RGB,
+ MESA_FORMAT_ATC_RGBA_EXPLICIT,
+ MESA_FORMAT_ATC_RGBA_INTERPOLATED,
+
MESA_FORMAT_COUNT
} mesa_format;
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/framebuffer.c
--- a/external/mit/MesaLib/dist/src/mesa/main/framebuffer.c Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/framebuffer.c Tue Sep 24 18:11:06 2019 +0000
@@ -459,7 +459,7 @@
fb->Visual.rgbBits = fb->Visual.redBits
+ fb->Visual.greenBits + fb->Visual.blueBits;
if (_mesa_get_format_color_encoding(fmt) == GL_SRGB)
- fb->Visual.sRGBCapable = ctx->Extensions.EXT_framebuffer_sRGB;
+ fb->Visual.sRGBCapable = ctx->Extensions.EXT_sRGB;
break;
}
}
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/get.c
--- a/external/mit/MesaLib/dist/src/mesa/main/get.c Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/get.c Tue Sep 24 18:11:06 2019 +0000
@@ -315,9 +315,10 @@
EXTRA_END
};
-static const int extra_GLSL_130_es3[] = {
+static const int extra_GLSL_130_es3_gpushader4[] = {
EXTRA_GLSL_130,
EXTRA_API_ES3,
+ EXT(EXT_gpu_shader4),
EXTRA_END
};
@@ -727,14 +728,50 @@
v->value_matrix = ctx->TextureMatrixStack[unit].Top;
break;
+ case GL_VERTEX_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_POS);
+ break;
+ case GL_NORMAL_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_NORMAL);
+ break;
+ case GL_COLOR_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR0);
+ break;
case GL_TEXTURE_COORD_ARRAY:
- case GL_TEXTURE_COORD_ARRAY_SIZE:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_TEX(ctx->Array.ActiveTexture));
+ break;
+ case GL_INDEX_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR_INDEX);
+ break;
+ case GL_EDGE_FLAG_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_EDGEFLAG);
+ break;
+ case GL_SECONDARY_COLOR_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_COLOR1);
+ break;
+ case GL_FOG_COORDINATE_ARRAY:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_FOG);
+ break;
+ case GL_POINT_SIZE_ARRAY_OES:
+ v->value_bool = !!(ctx->Array.VAO->Enabled & VERT_BIT_POINT_SIZE);
+ break;
+
case GL_TEXTURE_COORD_ARRAY_TYPE:
case GL_TEXTURE_COORD_ARRAY_STRIDE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)];
v->value_int = *(GLuint *) ((char *) array + d->offset);
break;
+ case GL_TEXTURE_COORD_ARRAY_SIZE:
+ array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)];
+ v->value_int = array->Format.Size;
+ break;
+
+ case GL_VERTEX_ARRAY_SIZE:
+ array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POS];
+ v->value_int = array->Format.Size;
+ break;
+
case GL_ACTIVE_TEXTURE_ARB:
v->value_int = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
break;
@@ -945,11 +982,11 @@
/* ARB_vertex_array_bgra */
case GL_COLOR_ARRAY_SIZE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR0];
- v->value_int = array->Format == GL_BGRA ? GL_BGRA : array->Size;
+ v->value_int = array->Format.Format == GL_BGRA ? GL_BGRA : array->Format.Size;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE:
array = &ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_COLOR1];
- v->value_int = array->Format == GL_BGRA ? GL_BGRA : array->Size;
+ v->value_int = array->Format.Format == GL_BGRA ? GL_BGRA : array->Format.Size;
break;
/* ARB_copy_buffer */
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/get_hash_generator.py
--- a/external/mit/MesaLib/dist/src/mesa/main/get_hash_generator.py Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/get_hash_generator.py Tue Sep 24 18:11:06 2019 +0000
@@ -30,15 +30,14 @@
from __future__ import print_function
-import os, sys, imp, getopt
+import os, sys, getopt
from collections import defaultdict
import get_hash_params
-cur_dir = os.path.dirname(sys.argv[0])
-param_desc_file = "%s/get_hash_params.py" % cur_dir
+param_desc_file = os.path.join(os.path.dirname(__file__), "get_hash_params.py")
-GLAPI = "%s/../../mapi/glapi/gen" % cur_dir
-sys.path.append(GLAPI)
+GLAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "glapi", "gen")
+sys.path.insert(0, GLAPI)
import gl_XML
prime_factor = 89
diff -r 9b644641f5d3 -r e13882f8f6ac external/mit/MesaLib/dist/src/mesa/main/get_hash_params.py
--- a/external/mit/MesaLib/dist/src/mesa/main/get_hash_params.py Tue Sep 24 18:00:54 2019 +0000
+++ b/external/mit/MesaLib/dist/src/mesa/main/get_hash_params.py Tue Sep 24 18:11:06 2019 +0000
@@ -211,20 +211,20 @@
[ "TEXTURE_2D", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
[ "TEXTURE_MATRIX", "LOC_CUSTOM, TYPE_MATRIX, 0, extra_valid_texture_unit" ],
[ "TEXTURE_STACK_DEPTH", "LOC_CUSTOM, TYPE_INT, 0, extra_valid_texture_unit" ],
- [ "VERTEX_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_POS].Enabled), NO_EXTRA" ],
- [ "VERTEX_ARRAY_SIZE", "ARRAY_UBYTE(VertexAttrib[VERT_ATTRIB_POS].Size), NO_EXTRA" ],
- [ "VERTEX_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_POS].Type), NO_EXTRA" ],
+ [ "VERTEX_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
+ [ "VERTEX_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
+ [ "VERTEX_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_POS].Format.Type), NO_EXTRA" ],
[ "VERTEX_ARRAY_STRIDE", "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_POS].Stride), NO_EXTRA" ],
- [ "NORMAL_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_NORMAL].Enabled), NO_EXTRA" ],
- [ "NORMAL_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_NORMAL].Type), NO_EXTRA" ],
+ [ "NORMAL_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
+ [ "NORMAL_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_NORMAL].Format.Type), NO_EXTRA" ],
[ "NORMAL_ARRAY_STRIDE", "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_NORMAL].Stride), NO_EXTRA" ],
- [ "COLOR_ARRAY", "ARRAY_BOOL(VertexAttrib[VERT_ATTRIB_COLOR0].Enabled), NO_EXTRA" ],
+ [ "COLOR_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
[ "COLOR_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
- [ "COLOR_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_COLOR0].Type), NO_EXTRA" ],
+ [ "COLOR_ARRAY_TYPE", "ARRAY_ENUM16(VertexAttrib[VERT_ATTRIB_COLOR0].Format.Type), NO_EXTRA" ],
[ "COLOR_ARRAY_STRIDE", "ARRAY_SHORT(VertexAttrib[VERT_ATTRIB_COLOR0].Stride), NO_EXTRA" ],
- [ "TEXTURE_COORD_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, offsetof(struct gl_array_attributes, Enabled), NO_EXTRA" ],
- [ "TEXTURE_COORD_ARRAY_SIZE", "LOC_CUSTOM, TYPE_UBYTE, offsetof(struct gl_array_attributes, Size), NO_EXTRA" ],
- [ "TEXTURE_COORD_ARRAY_TYPE", "LOC_CUSTOM, TYPE_ENUM16, offsetof(struct gl_array_attributes, Type), NO_EXTRA" ],
+ [ "TEXTURE_COORD_ARRAY", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
+ [ "TEXTURE_COORD_ARRAY_SIZE", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
+ [ "TEXTURE_COORD_ARRAY_TYPE", "LOC_CUSTOM, TYPE_ENUM16, offsetof(struct gl_array_attributes, Format.Type), NO_EXTRA" ],
[ "TEXTURE_COORD_ARRAY_STRIDE", "LOC_CUSTOM, TYPE_SHORT, offsetof(struct gl_array_attributes, Stride), NO_EXTRA" ],
# GL_ARB_multitexture
@@ -253,8 +253,8 @@
{ "apis": ["GLES"], "params": [
# OES_point_size_array
- [ "POINT_SIZE_ARRAY_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN), NO_EXTRA" ],
- [ "POINT_SIZE_ARRAY_TYPE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM16), NO_EXTRA" ],
+ [ "POINT_SIZE_ARRAY_OES", "LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA" ],
+ [ "POINT_SIZE_ARRAY_TYPE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Format.Type, TYPE_ENUM16), NO_EXTRA" ],
[ "POINT_SIZE_ARRAY_STRIDE_OES", "ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Stride, TYPE_SHORT), NO_EXTRA" ],
[ "POINT_SIZE_ARRAY_BUFFER_BINDING_OES", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
]},
@@ -280,6 +280,9 @@
# GL_ARB_draw_buffers
[ "MAX_DRAW_BUFFERS_ARB", "CONTEXT_INT(Const.MaxDrawBuffers), NO_EXTRA" ],
+# GL_ARB_parallel_shader_compile
+ [ "MAX_SHADER_COMPILER_THREADS_ARB", "CONTEXT_INT(Hint.MaxShaderCompilerThreads), NO_EXTRA" ],
+
# GL_EXT_framebuffer_object / GL_NV_fbo_color_attachments
[ "MAX_COLOR_ATTACHMENTS", "CONTEXT_INT(Const.MaxColorAttachments), NO_EXTRA" ],
@@ -436,8 +439,8 @@
[ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, NO_EXTRA" ],
# GL_EXT_gpu_shader4 / GLSL 1.30
- [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3" ],
- [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3" ],
+ [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3_gpushader4" ],
+ [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3_gpushader4" ],
# GL_EXT_pixel_buffer_object
[ "PIXEL_PACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ],
@@ -463,6 +466,9 @@
[ "MIN_FRAGMENT_INTERPOLATION_OFFSET", "CONTEXT_FLOAT(Const.MinFragmentInterpolationOffset), extra_ARB_gpu_shader5_or_OES_sample_variables" ],
[ "MAX_FRAGMENT_INTERPOLATION_OFFSET", "CONTEXT_FLOAT(Const.MaxFragmentInterpolationOffset), extra_ARB_gpu_shader5_or_OES_sample_variables" ],
[ "FRAGMENT_INTERPOLATION_OFFSET_BITS", "CONST(FRAGMENT_INTERPOLATION_OFFSET_BITS), extra_ARB_gpu_shader5_or_OES_sample_variables" ],
+
+# GL_EXT_framebuffer_EXT / GLES 3.0 + EXT_sRGB_write_control
+ [ "FRAMEBUFFER_SRGB_EXT", "CONTEXT_BOOL(Color.sRGBEnabled), extra_EXT_framebuffer_sRGB" ],
]},
Home |
Main Index |
Thread Index |
Old Index