Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[jgardou] 60511: [MESA] - leaner build part 8 of X - Get rid of the support for opengl ES and their extensions, the ARB_depth_clamp extension and the program implementation of the fixed function pi...
by jgardou＠svn.reactos.org 02 Oct '13

02 Oct '13

Author: jgardou Date: Wed Oct 2 15:06:13 2013 New Revision: 60511 URL: http://svn.reactos.org/svn/reactos?rev=60511&view=rev Log: [MESA] - leaner build part 8 of X - Get rid of the support for opengl ES and their extensions, the ARB_depth_clamp extension and the program implementation of the fixed function pipeline. CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/drawtex.c trunk/reactos/dll/opengl/mesa/src/mesa/main/drawtex.h trunk/reactos/dll/opengl/mesa/src/mesa/main/ff_fragment_shader.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/ffvertex_prog.c trunk/reactos/dll/opengl/mesa/src/mesa/main/ffvertex_prog.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.h trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_program.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vp_build.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vp_build.h Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp.c trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp.h trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/pp.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp trunk/reactos/dll/opengl/mesa/src/glsl/main.cpp trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp trunk/reactos/dll/opengl/mesa/src/glsl/test_optpass.cpp trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.c trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/context.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/getstring.c trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/math/m_clip_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/math/m_debug_clip.c trunk/reactos/dll/opengl/mesa/src/mesa/math/m_xform.h trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aaline.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aalinetemp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aatriangle.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_lines.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.h trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_rasterpos.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_vertex.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/tnl.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c trunk/reactos/dll/opengl/opengl32/swimpl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/l… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/m… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/s… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/test_optpass.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/drawtex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/drawtex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/ff_fragment_shader.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/ffvertex_prog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/ffvertex_prog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/math/m_clip_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/math/m_debug_clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/math/m_xform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aaline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aalinetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aatriangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_rasterpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_vertex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vp_build.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vp_build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/tnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl…

1 0

[jgardou] 60510: [OPENGL32] - Initialize the viewport when setting the context as current for the first time.
by jgardou＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: jgardou Date: Tue Oct 1 23:08:50 2013 New Revision: 60510 URL: http://svn.reactos.org/svn/reactos?rev=60510&view=rev Log: [OPENGL32] - Initialize the viewport when setting the context as current for the first time. Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] Tue Oct 1 23:08:50 2013 @@ -13,6 +13,7 @@ #include <main/framebuffer.h> #include <main/renderbuffer.h> #include <main/shared.h> +#include <main/viewport.h> #include <swrast/s_context.h> #include <swrast/s_renderbuffer.h> #include <swrast_setup/swrast_setup.h> @@ -758,6 +759,15 @@ ERR("_mesa_make_current filaed!\n"); return FALSE; } + + /* Set the viewport if this is the first time we initialize this context */ + if(sw_ctx->mesa.Viewport.X == 0 && + sw_ctx->mesa.Viewport.Y == 0 && + sw_ctx->mesa.Viewport.Width == 0 && + sw_ctx->mesa.Viewport.Height == 0) + { + _mesa_set_viewport(&sw_ctx->mesa, 0, 0, width, height); + } /* update the framebuffer size */ _mesa_resize_framebuffer(&sw_ctx->mesa, fb->gl_buffer, width, height);

1 0

[jgardou] 60509: [[MESA] - leaner build part 7 of X - Get rid of the ARB_draw_elements and ARB_fragment_coord_conventions extensions CORE-7499
by jgardou＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: jgardou Date: Tue Oct 1 22:44:06 2013 New Revision: 60509 URL: http://svn.reactos.org/svn/reactos?rev=60509&view=rev Log: [[MESA] - leaner build part 7 of X - Get rid of the ARB_draw_elements and ARB_fragment_coord_conventions extensions CORE-7499 Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp trunk/reactos/dll/opengl/mesa/src/glsl/ast.h trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h trunk/reactos/dll/opengl/mesa/src/glsl/ir.cpp trunk/reactos/dll/opengl/mesa/src/glsl/ir.h trunk/reactos/dll/opengl/mesa/src/glsl/ir_clone.cpp trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/program/arbprogparse.c trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… ============================================================================== --- trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -3494,10 +3494,6 @@ add_builtin_define(parser, "GL_EXT_texture_array", 1); } - if (extensions->ARB_fragment_coord_conventions) - add_builtin_define(parser, "GL_ARB_fragment_coord_conventions", - 1); - if (extensions->ARB_shader_texture_lod) add_builtin_define(parser, "GL_ARB_shader_texture_lod", 1); Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… ============================================================================== --- trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -2008,8 +2008,7 @@ { if ((yyextra->language_version >= 140) || yyextra->AMD_conservative_depth_enable - || yyextra->ARB_conservative_depth_enable - || yyextra->ARB_fragment_coord_conventions_enable) { + || yyextra->ARB_conservative_depth_enable) { return LAYOUT_TOK; } else { yylval->identifier = strdup(yytext); Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… ============================================================================== --- trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -4111,12 +4111,6 @@ } (yyval.type_qualifier).flags.i = (yyvsp[(1) - (3)].type_qualifier).flags.i | (yyvsp[(3) - (3)].type_qualifier).flags.i; - - if ((yyvsp[(1) - (3)].type_qualifier).flags.q.explicit_location) - (yyval.type_qualifier).location = (yyvsp[(1) - (3)].type_qualifier).location; - - if ((yyvsp[(3) - (3)].type_qualifier).flags.q.explicit_location) - (yyval.type_qualifier).location = (yyvsp[(3) - (3)].type_qualifier).location; } break; @@ -4128,23 +4122,6 @@ bool got_one = false; memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier))); - - /* Layout qualifiers for ARB_fragment_coord_conventions. */ - if (!got_one && state->ARB_fragment_coord_conventions_enable) { - if (strcmp((yyvsp[(1) - (1)].identifier), "origin_upper_left") == 0) { - got_one = true; - (yyval.type_qualifier).flags.q.origin_upper_left = 1; - } else if (strcmp((yyvsp[(1) - (1)].identifier), "pixel_center_integer") == 0) { - got_one = true; - (yyval.type_qualifier).flags.q.pixel_center_integer = 1; - } - - if (got_one && state->ARB_fragment_coord_conventions_warn) { - _mesa_glsl_warning(& (yylsp[(1) - (1)]), state, - "GL_ARB_fragment_coord_conventions layout " - "identifier `%s' used\n", (yyvsp[(1) - (1)].identifier)); - } - } /* Layout qualifiers for AMD/ARB_conservative_depth. */ if (!got_one && Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/a… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/ast.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/ast.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -352,18 +352,6 @@ unsigned flat:1; unsigned noperspective:1; - /** \name Layout qualifiers for GL_ARB_fragment_coord_conventions */ - /*@{*/ - unsigned origin_upper_left:1; - unsigned pixel_center_integer:1; - /*@}*/ - - /** - * Flag set if GL_ARB_explicit_attrib_location "location" layout - * qualifier is used. - */ - unsigned explicit_location:1; - /** \name Layout qualifiers for GL_AMD_conservative_depth */ /** \{ */ unsigned depth_any:1; @@ -378,14 +366,6 @@ /** \brief Set of flags, accessed as a bitmask. */ unsigned i; } flags; - - /** - * Location specified via GL_ARB_explicit_attrib_location layout - * - * \note - * This field is only valid if \c explicit_location is set. - */ - int location; /** * Return true if and only if an interpolation qualifier is present. Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/a… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -2030,119 +2030,6 @@ } - var->pixel_center_integer = qual->flags.q.pixel_center_integer; - var->origin_upper_left = qual->flags.q.origin_upper_left; - if ((qual->flags.q.origin_upper_left || qual->flags.q.pixel_center_integer) - && (strcmp(var->name, "gl_FragCoord") != 0)) { - const char *const qual_string = (qual->flags.q.origin_upper_left) - ? "origin_upper_left" : "pixel_center_integer"; - - _mesa_glsl_error(loc, state, - "layout qualifier `%s' can only be applied to " - "fragment shader input `gl_FragCoord'", - qual_string); - } - - if (qual->flags.q.explicit_location) { - const bool global_scope = (state->current_function == NULL); - bool fail = false; - const char *string = ""; - - /* In the vertex shader only shader inputs can be given explicit - * locations. - * - * In the fragment shader only shader outputs can be given explicit - * locations. - */ - switch (state->target) { - case vertex_shader: - if (!global_scope || (var->mode != ir_var_in)) { - fail = true; - string = "input"; - } - break; - - case fragment_shader: - if (!global_scope || (var->mode != ir_var_out)) { - fail = true; - string = "output"; - } - break; - }; - - if (fail) { - _mesa_glsl_error(loc, state, - "only %s shader %s variables can be given an " - "explicit location\n", - _mesa_glsl_shader_target_name(state->target), - string); - } else { - var->explicit_location = true; - - /* This bit of silliness is needed because invalid explicit locations - * are supposed to be flagged during linking. Small negative values - * biased by VERT_ATTRIB_GENERIC0 or FRAG_RESULT_DATA0 could alias - * built-in values (e.g., -16+VERT_ATTRIB_GENERIC0 = VERT_ATTRIB_POS). - * The linker needs to be able to differentiate these cases. This - * ensures that negative values stay negative. - */ - if (qual->location >= 0) { - var->location = (state->target == vertex_shader) - ? (qual->location + VERT_ATTRIB_GENERIC0) - : (qual->location + FRAG_RESULT_DATA0); - } else { - var->location = qual->location; - } - } - } - - /* Does the declaration use the 'layout' keyword? - */ - const bool uses_layout = qual->flags.q.pixel_center_integer - || qual->flags.q.origin_upper_left - || qual->flags.q.explicit_location; - - /* Does the declaration use the deprecated 'attribute' or 'varying' - * keywords? - */ - const bool uses_deprecated_qualifier = qual->flags.q.attribute - || qual->flags.q.varying; - - /* Is the 'layout' keyword used with parameters that allow relaxed checking. - * Many implementations of GL_ARB_fragment_coord_conventions_enable and some - * implementations (only Mesa?) GL_ARB_explicit_attrib_location_enable - * allowed the layout qualifier to be used with 'varying' and 'attribute'. - * These extensions and all following extensions that add the 'layout' - * keyword have been modified to require the use of 'in' or 'out'. - * - * The following extension do not allow the deprecated keywords: - * - * GL_AMD_conservative_depth - * GL_ARB_conservative_depth - * GL_ARB_gpu_shader5 - * GL_ARB_separate_shader_objects - * GL_ARB_tesselation_shader - * GL_ARB_transform_feedback3 - * GL_ARB_uniform_buffer_object - * - * It is unknown whether GL_EXT_shader_image_load_store or GL_NV_gpu_shader5 - * allow layout with the deprecated keywords. - */ - const bool relaxed_layout_qualifier_checking = - state->ARB_fragment_coord_conventions_enable; - - if (uses_layout && uses_deprecated_qualifier) { - if (relaxed_layout_qualifier_checking) { - _mesa_glsl_warning(loc, state, - "`layout' qualifier may not be used with " - "`attribute' or `varying'"); - } else { - _mesa_glsl_error(loc, state, - "`layout' qualifier may not be used with " - "`attribute' or `varying'"); - } - } - /* Layout qualifiers for gl_FragDepth, which are enabled by extension * AMD_conservative_depth. */ @@ -2236,26 +2123,6 @@ earlier->type = var->type; delete var; var = NULL; - } else if (state->ARB_fragment_coord_conventions_enable - && strcmp(var->name, "gl_FragCoord") == 0 - && earlier->type == var->type - && earlier->mode == var->mode) { - /* Allow redeclaration of gl_FragCoord for ARB_fcc layout - * qualifiers. - */ - earlier->origin_upper_left = var->origin_upper_left; - earlier->pixel_center_integer = var->pixel_center_integer; - - /* According to section 4.3.7 of the GLSL 1.30 spec, - * the following built-in varaibles can be redeclared with an - * interpolation qualifier: - * * gl_FrontColor - * * gl_BackColor - * * gl_FrontSecondaryColor - * * gl_BackSecondaryColor - * * gl_Color - * * gl_SecondaryColor - */ } else if (state->language_version >= 130 && (strcmp(var->name, "gl_FrontColor") == 0 || strcmp(var->name, "gl_BackColor") == 0 @@ -2579,8 +2446,7 @@ * This is relaxed in GLSL 1.30. It is also relaxed by any extension * that adds the 'layout' keyword. */ - if ((state->language_version < 130) - && !state->ARB_fragment_coord_conventions_enable) { + if (state->language_version < 130) { if (this->type->qualifier.flags.q.out) { _mesa_glsl_error(& loc, state, "`out' qualifier in declaration of `%s' " Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -407,7 +407,6 @@ } var->location = slot; - var->explicit_location = (slot >= 0); /* Once the variable is created an initialized, add it to the symbol table * and add the declaration to the IR stream. Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -3444,10 +3444,6 @@ add_builtin_define(parser, "GL_EXT_texture_array", 1); } - if (extensions->ARB_fragment_coord_conventions) - add_builtin_define(parser, "GL_ARB_fragment_coord_conventions", - 1); - if (extensions->ARB_shader_texture_lod) add_builtin_define(parser, "GL_ARB_shader_texture_lod", 1); Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -2001,8 +2001,7 @@ { if ((yyextra->language_version >= 140) || yyextra->AMD_conservative_depth_enable - || yyextra->ARB_conservative_depth_enable - || yyextra->ARB_fragment_coord_conventions_enable) { + || yyextra->ARB_conservative_depth_enable) { return LAYOUT_TOK; } else { yylval->identifier = strdup(yytext); Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -4080,12 +4080,6 @@ } (yyval.type_qualifier).flags.i = (yyvsp[(1) - (3)].type_qualifier).flags.i | (yyvsp[(3) - (3)].type_qualifier).flags.i; - - if ((yyvsp[(1) - (3)].type_qualifier).flags.q.explicit_location) - (yyval.type_qualifier).location = (yyvsp[(1) - (3)].type_qualifier).location; - - if ((yyvsp[(3) - (3)].type_qualifier).flags.q.explicit_location) - (yyval.type_qualifier).location = (yyvsp[(3) - (3)].type_qualifier).location; ;} break; @@ -4097,23 +4091,6 @@ bool got_one = false; memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier))); - - /* Layout qualifiers for ARB_fragment_coord_conventions. */ - if (!got_one && state->ARB_fragment_coord_conventions_enable) { - if (strcmp((yyvsp[(1) - (1)].identifier), "origin_upper_left") == 0) { - got_one = true; - (yyval.type_qualifier).flags.q.origin_upper_left = 1; - } else if (strcmp((yyvsp[(1) - (1)].identifier), "pixel_center_integer") == 0) { - got_one = true; - (yyval.type_qualifier).flags.q.pixel_center_integer = 1; - } - - if (got_one && state->ARB_fragment_coord_conventions_warn) { - _mesa_glsl_warning(& (yylsp[(1) - (1)]), state, - "GL_ARB_fragment_coord_conventions layout " - "identifier `%s' used\n", (yyvsp[(1) - (1)].identifier)); - } - } /* Layout qualifiers for AMD/ARB_conservative_depth. */ if (!got_one && Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -260,7 +260,6 @@ EXT(ARB_conservative_depth, false, false, true, true, false, ARB_conservative_depth), EXT(ARB_draw_buffers, false, false, true, true, false, dummy_true), EXT(ARB_draw_instanced, true, false, false, true, false, ARB_draw_instanced), - EXT(ARB_fragment_coord_conventions, true, false, true, true, false, ARB_fragment_coord_conventions), EXT(ARB_texture_rectangle, true, false, true, true, false, dummy_true), EXT(EXT_texture_array, true, false, true, true, false, EXT_texture_array), EXT(ARB_shader_texture_lod, true, false, true, true, false, ARB_shader_texture_lod), Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -180,8 +180,6 @@ bool ARB_draw_buffers_warn; bool ARB_draw_instanced_enable; bool ARB_draw_instanced_warn; - bool ARB_fragment_coord_conventions_enable; - bool ARB_fragment_coord_conventions_warn; bool ARB_texture_rectangle_enable; bool ARB_texture_rectangle_warn; bool EXT_texture_array_enable; Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ir.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/i… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/ir.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/ir.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -1325,14 +1325,11 @@ this->ir_type = ir_type_variable; this->type = type; this->name = ralloc_strdup(this, name); - this->explicit_location = false; this->has_initializer = false; this->location = -1; this->warn_extension = NULL; this->constant_value = NULL; this->constant_initializer = NULL; - this->origin_upper_left = false; - this->pixel_center_integer = false; this->depth_layout = ir_depth_layout_none; this->used = false; Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ir.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/i… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/ir.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/ir.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -347,22 +347,7 @@ */ unsigned interpolation:2; - /** - * \name ARB_fragment_coord_conventions - * @{ - */ - unsigned origin_upper_left:1; - unsigned pixel_center_integer:1; /*@}*/ - - /** - * Was the location explicitly set in the shader? - * - * If the location is explicitly set in the shader, it \b cannot be changed - * by the linker or by the API (e.g., calls to \c glBindAttribLocation have - * no effect). - */ - unsigned explicit_location:1; /** * Does this variable have an initializer? Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ir_clone.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/i… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/ir_clone.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/ir_clone.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -47,9 +47,6 @@ var->interpolation = this->interpolation; var->location = this->location; var->warn_extension = this->warn_extension; - var->origin_upper_left = this->origin_upper_left; - var->pixel_center_integer = this->pixel_center_integer; - var->explicit_location = this->explicit_location; var->has_initializer = this->has_initializer; var->depth_layout = this->depth_layout; @@ -63,9 +60,6 @@ memcpy(var->state_slots, this->state_slots, sizeof(this->state_slots[0]) * var->num_state_slots); } - - if (this->explicit_location) - var->location = this->location; if (this->constant_value) var->constant_value = this->constant_value->clone(mem_ctx, ht); Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/l… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -202,7 +202,7 @@ /* Only assign locations for generic attributes / varyings / etc. */ - if ((var->location >= generic_base) && !var->explicit_location) + if (var->location >= generic_base) var->location = -1; } } @@ -407,19 +407,6 @@ existing->type->name); return false; } - } - - if (var->explicit_location) { - if (existing->explicit_location - && (var->location != existing->location)) { - linker_error(prog, "explicit locations for %s " - "`%s' have differing values\n", - mode_string(var), var->name); - return false; - } - - existing->location = var->location; - existing->explicit_location = true; } /* Validate layout qualifiers for gl_FragDepth. @@ -1214,17 +1201,7 @@ if ((var == NULL) || (var->mode != (unsigned) direction)) continue; - if (var->explicit_location) { - if ((var->location >= (int)(max_index + generic_base)) - || (var->location < 0)) { - linker_error(prog, - "invalid explicit location %d specified for `%s'\n", - (var->location < 0) - ? var->location : var->location - generic_base, - var->name); - return false; - } - } else if (target_index == MESA_SHADER_VERTEX) { + if (target_index == MESA_SHADER_VERTEX) { unsigned binding; if (prog->AttributeBindings->get(binding, var->name)) { Modified: trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -68,7 +68,6 @@ ctx->Extensions.dummy_true = true; ctx->Extensions.ARB_ES2_compatibility = true; ctx->Extensions.ARB_draw_instanced = true; - ctx->Extensions.ARB_fragment_coord_conventions = true; ctx->Extensions.EXT_texture_array = true; ctx->Extensions.NV_texture_rectangle = true; ctx->Extensions.EXT_texture3D = true; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -164,7 +164,7 @@ */ static GLboolean check_index_bounds(struct gl_context *ctx, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) + const GLvoid *indices) { struct _mesa_prim prim; struct _mesa_index_buffer ib; @@ -186,8 +186,7 @@ vbo_get_minmax_index(ctx, &prim, &ib, &min, &max); - if ((int)(min + basevertex) < 0 || - max + basevertex >= ctx->Array.ArrayObj->_MaxElement) { + if (max >= ctx->Array.ArrayObj->_MaxElement) { /* the max element is out of bounds of one or more enabled arrays */ _mesa_warning(ctx, "glDrawElements() index=%u is out of bounds (max=%u)", max, ctx->Array.ArrayObj->_MaxElement); @@ -223,7 +222,7 @@ GLboolean _mesa_validate_DrawElements(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) + const GLvoid *indices) { ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -264,7 +263,7 @@ return GL_FALSE; } - if (!check_index_bounds(ctx, count, type, indices, basevertex)) + if (!check_index_bounds(ctx, count, type, indices)) return GL_FALSE; return GL_TRUE; @@ -280,7 +279,7 @@ _mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) + const GLvoid *indices) { ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -325,7 +324,7 @@ return GL_FALSE; } - if (!check_index_bounds(ctx, count, type, indices, basevertex)) + if (!check_index_bounds(ctx, count, type, indices)) return GL_FALSE; return GL_TRUE; @@ -413,8 +412,7 @@ GLboolean _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLsizei numInstances, - GLint basevertex) + const GLvoid *indices, GLsizei numInstances) { ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -465,9 +463,9 @@ return GL_FALSE; } - if (!check_index_bounds(ctx, count, type, indices, basevertex)) - return GL_FALSE; - - return GL_TRUE; -} - + if (!check_index_bounds(ctx, count, type, indices)) + return GL_FALSE; + + return GL_TRUE; +} + Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -53,13 +53,13 @@ extern GLboolean _mesa_validate_DrawElements(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex); + const GLvoid *indices); extern GLboolean _mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex); + const GLvoid *indices); extern GLboolean @@ -69,7 +69,6 @@ extern GLboolean _mesa_validate_DrawElementsInstanced(struct gl_context *ctx, GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLsizei primcount, - GLint basevertex); + const GLvoid *indices, GLsizei primcount); #endif Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -1022,29 +1022,11 @@ GLenum type, const GLvoid **indices, GLsizei primcount); - void (GLAPIENTRYP DrawElementsBaseVertex)( GLenum mode, GLsizei count, - GLenum type, - const GLvoid *indices, - GLint basevertex ); - void (GLAPIENTRYP DrawRangeElementsBaseVertex)( GLenum mode, GLuint start, - GLuint end, GLsizei count, - GLenum type, - const GLvoid *indices, - GLint basevertex); - void (GLAPIENTRYP MultiDrawElementsBaseVertex)( GLenum mode, - const GLsizei *count, - GLenum type, - const GLvoid **indices, - GLsizei primcount, - const GLint *basevertex); void (GLAPIENTRYP DrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); void (GLAPIENTRYP DrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); - void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, - GLenum type, const GLvoid *indices, - GLsizei primcount, GLint basevertex); /*@}*/ /** Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -640,10 +640,6 @@ #define _gloffset_BindVertexArray 583 #define _gloffset_GenVertexArrays 584 #define _gloffset_CopyBufferSubData 585 -#define _gloffset_DrawElementsBaseVertex 593 -#define _gloffset_DrawElementsInstancedBaseVertex 594 -#define _gloffset_DrawRangeElementsBaseVertex 595 -#define _gloffset_MultiDrawElementsBaseVertex 596 #define _gloffset_BlendEquationSeparateiARB 597 #define _gloffset_BlendEquationiARB 598 #define _gloffset_BlendFuncSeparateiARB 599 @@ -1100,10 +1096,6 @@ #define BindVertexArray_remap_index 175 #define GenVertexArrays_remap_index 176 #define CopyBufferSubData_remap_index 177 -#define DrawElementsBaseVertex_remap_index 185 -#define DrawElementsInstancedBaseVertex_remap_index 186 -#define DrawRangeElementsBaseVertex_remap_index 187 -#define MultiDrawElementsBaseVertex_remap_index 188 #define BlendEquationSeparateiARB_remap_index 189 #define BlendEquationiARB_remap_index 190 #define BlendFuncSeparateiARB_remap_index 191 @@ -1554,10 +1546,6 @@ #define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index] #define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index] #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index] -#define _gloffset_DrawElementsBaseVertex driDispatchRemapTable[DrawElementsBaseVertex_remap_index] -#define _gloffset_DrawElementsInstancedBaseVertex driDispatchRemapTable[DrawElementsInstancedBaseVertex_remap_index] -#define _gloffset_DrawRangeElementsBaseVertex driDispatchRemapTable[DrawRangeElementsBaseVertex_remap_index] -#define _gloffset_MultiDrawElementsBaseVertex driDispatchRemapTable[MultiDrawElementsBaseVertex_remap_index] #define _gloffset_BlendEquationSeparateiARB driDispatchRemapTable[BlendEquationSeparateiARB_remap_index] #define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index] #define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index] @@ -8137,50 +8125,6 @@ SET_by_offset(disp, _gloffset_CopyBufferSubData, fn); } -typedef void (GLAPIENTRYP _glptr_DrawElementsBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLint); -#define CALL_DrawElementsBaseVertex(disp, parameters) \ - (* GET_DrawElementsBaseVertex(disp)) parameters -static inline _glptr_DrawElementsBaseVertex GET_DrawElementsBaseVertex(struct _glapi_table *disp) { - return (_glptr_DrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsBaseVertex)); -} - -static inline void SET_DrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)) { - SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn); -} - -typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint); -#define CALL_DrawElementsInstancedBaseVertex(disp, parameters) \ - (* GET_DrawElementsInstancedBaseVertex(disp)) parameters -static inline _glptr_DrawElementsInstancedBaseVertex GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp) { - return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex)); -} - -static inline void SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint)) { - SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn); -} - -typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint); -#define CALL_DrawRangeElementsBaseVertex(disp, parameters) \ - (* GET_DrawRangeElementsBaseVertex(disp)) parameters -static inline _glptr_DrawRangeElementsBaseVertex GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp) { - return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex)); -} - -static inline void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)) { - SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn); -} - -typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *); -#define CALL_MultiDrawElementsBaseVertex(disp, parameters) \ - (* GET_MultiDrawElementsBaseVertex(disp)) parameters -static inline _glptr_MultiDrawElementsBaseVertex GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp) { - return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex)); -} - -static inline void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei, const GLint *)) { - SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn); -} - typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB)(GLuint, GLenum, GLenum); #define CALL_BlendEquationSeparateiARB(disp, parameters) \ (* GET_BlendEquationSeparateiARB(disp)) parameters Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -1271,19 +1271,6 @@ GET_CURRENT_CONTEXT(ctx); _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawElementsInstanced() during display list compile"); -} - -static void GLAPIENTRY -save_DrawElementsInstancedBaseVertexARB(GLenum mode, - GLsizei count, - GLenum type, - const GLvoid *indices, - GLsizei primcount, - GLint basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - _mesa_error(ctx, GL_INVALID_OPERATION, - "glDrawElementsInstancedBaseVertex() during display list compile"); } static void invalidate_saved_current_state( struct gl_context *ctx ) @@ -10051,9 +10038,6 @@ vfmt->DrawArraysInstanced = save_DrawArraysInstancedARB; vfmt->DrawElementsInstanced = save_DrawElementsInstancedARB; - /* GL_ARB_draw_elements_base_vertex */ - vfmt->DrawElementsInstancedBaseVertex = save_DrawElementsInstancedBaseVertexARB; - /* The driver is required to implement these as * 1) They can probably do a better job. * 2) A lot of new mechanisms would have to be added to this module Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -85,9 +85,6 @@ { "GL_ARB_depth_clamp", o(ARB_depth_clamp), GL, 2003 }, { "GL_ARB_draw_buffers", o(dummy_true), GL, 2002 }, { "GL_ARB_draw_buffers_blend", o(ARB_draw_buffers_blend), GL, 2009 }, - { "GL_ARB_draw_elements_base_vertex", o(ARB_draw_elements_base_vertex), GL, 2009 }, - { "GL_ARB_draw_instanced", o(ARB_draw_instanced), GL, 2008 }, - { "GL_ARB_fragment_coord_conventions", o(ARB_fragment_coord_conventions), GL, 2009 }, { "GL_ARB_fragment_program", o(ARB_fragment_program), GL, 2002 }, { "GL_ARB_fragment_program_shadow", o(ARB_fragment_program_shadow), GL, 2003 }, { "GL_ARB_fragment_shader", o(ARB_fragment_shader), GL, 2002 }, @@ -348,9 +345,7 @@ { /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/ ctx->Extensions.ARB_depth_clamp = GL_TRUE; - ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE; ctx->Extensions.ARB_draw_instanced = GL_TRUE; - ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE; #if FEATURE_ARB_fragment_program ctx->Extensions.ARB_fragment_program = GL_TRUE; ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -1824,8 +1824,6 @@ { struct gl_program Base; /**< base class */ GLboolean UsesKill; /**< shader uses KIL instruction */ - GLboolean OriginUpperLeft; - GLboolean PixelCenterInteger; enum gl_frag_depth_layout FragDepthLayout; /** @@ -2495,9 +2493,7 @@ GLboolean ARB_depth_buffer_float; GLboolean ARB_depth_clamp; GLboolean ARB_draw_buffers_blend; - GLboolean ARB_draw_elements_base_vertex; GLboolean ARB_draw_instanced; - GLboolean ARB_fragment_coord_conventions; GLboolean ARB_fragment_program; GLboolean ARB_fragment_program_shadow; GLboolean ARB_fragment_shader; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -201,12 +201,6 @@ const GLvoid **indices, GLsizei primcount ); extern void GLAPIENTRY -_mesa_MultiDrawElementsBaseVertex( GLenum mode, - const GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, - const GLint *basevertex); - -extern void GLAPIENTRY _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride ); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -148,9 +148,7 @@ ctx->Const.MaxVertexTextureImageUnits >= 16); const GLboolean ver_3_2 = (ver_3_1 && ctx->Const.GLSLVersion >= 150 && - ctx->Extensions.ARB_depth_clamp && - ctx->Extensions.ARB_draw_elements_base_vertex && - ctx->Extensions.ARB_fragment_coord_conventions); + ctx->Extensions.ARB_depth_clamp); if (ver_3_2) { major = 3; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -101,12 +101,8 @@ SET_DrawElements(tab, vfmt->DrawElements); SET_DrawRangeElements(tab, vfmt->DrawRangeElements); SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT); - SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex); - SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex); - SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex); SET_DrawArraysInstancedARB(tab, vfmt->DrawArraysInstanced); SET_DrawElementsInstancedARB(tab, vfmt->DrawElementsInstanced); - SET_DrawElementsInstancedBaseVertex(tab, vfmt->DrawElementsInstancedBaseVertex); /* GL_NV_vertex_program */ SET_VertexAttrib1fNV(tab, vfmt->VertexAttrib1fNV); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/arbprogparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/arbprogparse.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/arbprogparse.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -116,8 +116,6 @@ program->Base.SamplersUsed |= (1 << i); } program->Base.ShadowSamplers = prog.ShadowSamplers; - program->OriginUpperLeft = state.option.OriginUpperLeft; - program->PixelCenterInteger = state.option.PixelCenterInteger; program->UsesKill = state.fragment.UsesKill; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -680,13 +680,6 @@ void ir_to_mesa_visitor::visit(ir_variable *ir) { - if (strcmp(ir->name, "gl_FragCoord") == 0) { - struct gl_fragment_program *fp = (struct gl_fragment_program *)this->prog; - - fp->OriginUpperLeft = ir->origin_upper_left; - fp->PixelCenterInteger = ir->pixel_center_integer; - } - if (ir->mode == ir_var_uniform && strncmp(ir->name, "gl_", 3) == 0) { unsigned int i; const ir_state_slot *const slots = ir->state_slots; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -480,8 +480,6 @@ = (const struct gl_fragment_program *) prog; struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone; fpc->UsesKill = fp->UsesKill; - fpc->OriginUpperLeft = fp->OriginUpperLeft; - fpc->PixelCenterInteger = fp->PixelCenterInteger; } break; default: Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -216,18 +216,6 @@ state->option.Shadow = 1; return 1; } - } else if (strncmp(option, "fragment_coord_", 15) == 0) { - option += 15; - if (state->ctx->Extensions.ARB_fragment_coord_conventions) { - if (strcmp(option, "origin_upper_left") == 0) { - state->option.OriginUpperLeft = 1; - return 1; - } - else if (strcmp(option, "pixel_center_integer") == 0) { - state->option.PixelCenterInteger = 1; - return 1; - } - } } } else if (strncmp(option, "ATI_", 4) == 0) { option += 4; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -208,8 +208,6 @@ unsigned TexRect:1; unsigned TexArray:1; unsigned NV_fragment:1; - unsigned OriginUpperLeft:1; - unsigned PixelCenterInteger:1; } option; struct { Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_fragprog.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -133,19 +133,9 @@ const struct gl_fragment_program *program, const SWspan *span, GLuint col) { - GLfloat *wpos = span->array->attribs[FRAG_ATTRIB_WPOS][col]; - if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) { /* Clear temporary registers (undefined for ARB_f_p) */ memset(machine->Temporaries, 0, MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat)); - } - - /* ARB_fragment_coord_conventions */ - if (program->OriginUpperLeft) - wpos[1] = ctx->DrawBuffer->Height - 1 - wpos[1]; - if (!program->PixelCenterInteger) { - wpos[0] += 0.5F; - wpos[1] += 0.5F; } /* Setup pointer to input attributes */ Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -330,27 +330,22 @@ ptr = ADD_POINTERS(ib->obj->Pointer, ib->ptr); } - if (ib->type == GL_UNSIGNED_INT && VB->Primitive[0].basevertex == 0) { + if (ib->type == GL_UNSIGNED_INT) { VB->Elts = (GLuint *) ptr; } else { GLuint *elts = (GLuint *)get_space(ctx, ib->count * sizeof(GLuint)); VB->Elts = elts; - if (ib->type == GL_UNSIGNED_INT) { - const GLuint *in = (GLuint *)ptr; - for (i = 0; i < ib->count; i++) - *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex; - } - else if (ib->type == GL_UNSIGNED_SHORT) { + if (ib->type == GL_UNSIGNED_SHORT) { const GLushort *in = (GLushort *)ptr; for (i = 0; i < ib->count; i++) - *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex; + *elts++ = (GLuint)(*in++); } else { const GLubyte *in = (GLubyte *)ptr; for (i = 0; i < ib->count; i++) - *elts++ = (GLuint)(*in++) + VB->Primitive[0].basevertex; + *elts++ = (GLuint)(*in++); } } } @@ -407,17 +402,13 @@ TNLcontext *tnl = TNL_CONTEXT(ctx); const GLuint TEST_SPLIT = 0; const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES; - GLint max_basevertex = prim->basevertex; - GLuint i; /* Mesa core state should have been validated already */ assert(ctx->NewState == 0x0); - for (i = 1; i < nr_prims; i++) - max_basevertex = MAX2(max_basevertex, prim[i].basevertex); - if (0) { + GLuint i; printf("%s %d..%d\n", __FUNCTION__, min_index, max_index); for (i = 0; i < nr_prims; i++) printf("prim %d: %s start %d count %d\n", i, @@ -434,7 +425,7 @@ _tnl_vbo_draw_prims ); return; } - else if ((GLint)max_index + max_basevertex > max) { + else if (max_index > max) { /* The software TNL pipeline has a fixed amount of storage for * vertices and it is necessary to split incoming drawing commands * if they exceed that limit. @@ -448,7 +439,7 @@ * recursively call back into this function. */ vbo_split_prims( ctx, arrays, prim, nr_prims, ib, - 0, max_index + prim->basevertex, + 0, max_index, _tnl_vbo_draw_prims, &limits ); } @@ -460,40 +451,22 @@ GLuint nr_bo = 0; GLuint inst; - for (i = 0; i < nr_prims;) { - GLuint this_nr_prims; - - /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices - * will rebase the elements to the basevertex, and we'll only - * emit strings of prims with the same basevertex in one draw call. - */ - for (this_nr_prims = 1; i + this_nr_prims < nr_prims; - this_nr_prims++) { - if (prim[i].basevertex != prim[i + this_nr_prims].basevertex) - break; - } - - assert(prim[i].num_instances > 0); - /* Binding inputs may imply mapping some vertex buffer objects. * They will need to be unmapped below. */ - for (inst = 0; inst < prim[i].num_instances; inst++) { - - bind_prims(ctx, &prim[i], this_nr_prims); - bind_inputs(ctx, arrays, max_index + prim[i].basevertex + 1, - bo, &nr_bo); - bind_indices(ctx, ib, bo, &nr_bo); - - tnl->CurInstance = inst; - TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx); - - unmap_vbos(ctx, bo, nr_bo); - free_space(ctx); - } - - i += this_nr_prims; - } - } -} - + for (inst = 0; inst < prim[0].num_instances; inst++) { + + bind_prims(ctx, prim, nr_prims); + bind_inputs(ctx, arrays, max_index + 1, + bo, &nr_bo); + bind_indices(ctx, ib, bo, &nr_bo); + + tnl->CurInstance = inst; + TNL_CONTEXT(ctx)->Driver.RunPipeline(ctx); + + unmap_vbos(ctx, bo, nr_bo); + free_space(ctx); + } + } +} + Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -49,7 +49,6 @@ GLuint start; GLuint count; - GLint basevertex; GLsizei num_instances; }; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -736,8 +736,7 @@ GLboolean index_bounds_valid, GLuint start, GLuint end, GLsizei count, GLenum type, - const GLvoid *indices, - GLint basevertex, GLint numInstances) + const GLvoid *indices, GLint numInstances) { struct vbo_context *vbo = vbo_context(ctx); struct vbo_exec_context *exec = &vbo->exec; @@ -771,7 +770,6 @@ prim[0].start = 0; prim[0].count = count; prim[0].indexed = 1; - prim[0].basevertex = basevertex; prim[0].num_instances = numInstances; /* Need to give special consideration to rendering a range of @@ -810,16 +808,14 @@ index_bounds_valid, start, end ); } - /** * Called by glDrawRangeElementsBaseVertex() in immediate mode. */ static void GLAPIENTRY -vbo_exec_DrawRangeElementsBaseVertex(GLenum mode, +vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, - const GLvoid *indices, - GLint basevertex) + const GLvoid *indices) { static GLuint warnCount = 0; GLboolean index_bounds_valid = GL_TRUE; @@ -827,16 +823,16 @@ if (MESA_VERBOSE & VERBOSE_DRAW) _mesa_debug(ctx, - "glDrawRangeElementsBaseVertex(%s, %u, %u, %d, %s, %p, %d)\n", + "glDrawRangeElementsBaseVertex(%s, %u, %u, %d, %s, %p)\n", _mesa_lookup_enum_by_nr(mode), start, end, count, - _mesa_lookup_enum_by_nr(type), indices, basevertex); + _mesa_lookup_enum_by_nr(type), indices); if (!_mesa_validate_DrawRangeElements( ctx, mode, start, end, count, - type, indices, basevertex )) + type, indices )) return; - if ((int) end + basevertex < 0 || - start + basevertex >= ctx->Array.ArrayObj->_MaxElement) { + if (end < start || + end >= ctx->Array.ArrayObj->_MaxElement) { /* The application requested we draw using a range of indices that's * outside the bounds of the current VBO. This is invalid and appears * to give undefined results. The safest thing to do is to simply @@ -846,10 +842,10 @@ */ if (warnCount++ < 10) { _mesa_warning(ctx, "glDrawRangeElements(start %u, end %u, " - "basevertex %d, count %d, type 0x%x, indices=%p):\n" + "count %d, type 0x%x, indices=%p):\n" "\trange is outside VBO bounds (max=%u); ignoring.\n" "\tThis should be fixed in the application.", - start, end, basevertex, count, type, indices, + start, end, count, type, indices, ctx->Array.ArrayObj->_MaxElement - 1); } index_bounds_valid = GL_FALSE; @@ -872,17 +868,11 @@ } if (0) { - printf("glDraw[Range]Elements{,BaseVertex}" - "(start %u, end %u, type 0x%x, count %d) ElemBuf %u, " - "base %d\n", + printf("glDraw[Range]Elements" + "(start %u, end %u, type 0x%x, count %d) ElemBuf %u\n", start, end, type, count, - ctx->Array.ArrayObj->ElementArrayBufferObj->Name, - basevertex); - } - - if ((int) start + basevertex < 0 || - end + basevertex >= ctx->Array.ArrayObj->_MaxElement) - index_bounds_valid = GL_FALSE; + ctx->Array.ArrayObj->ElementArrayBufferObj->Name); + } #if 0 check_draw_elements_data(ctx, count, type, indices); @@ -891,27 +881,7 @@ #endif vbo_validated_drawrangeelements(ctx, mode, index_bounds_valid, start, end, - count, type, indices, basevertex, 1); -} - - -/** - * Called by glDrawRangeElements() in immediate mode. - */ -static void GLAPIENTRY -vbo_exec_DrawRangeElements(GLenum mode, GLuint start, GLuint end, - GLsizei count, GLenum type, const GLvoid *indices) -{ - if (MESA_VERBOSE & VERBOSE_DRAW) { - GET_CURRENT_CONTEXT(ctx); - _mesa_debug(ctx, - "glDrawRangeElements(%s, %u, %u, %d, %s, %p)\n", - _mesa_lookup_enum_by_nr(mode), start, end, count, - _mesa_lookup_enum_by_nr(type), indices); - } - - vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type, - indices, 0); + count, type, indices, 1); } @@ -929,34 +899,11 @@ _mesa_lookup_enum_by_nr(mode), count, _mesa_lookup_enum_by_nr(type), indices); - if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, 0 )) + if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices)) return; vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0, - count, type, indices, 0, 1); -} - - -/** - * Called by glDrawElementsBaseVertex() in immediate mode. - */ -static void GLAPIENTRY -vbo_exec_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - - if (MESA_VERBOSE & VERBOSE_DRAW) - _mesa_debug(ctx, "glDrawElementsBaseVertex(%s, %d, %s, %p, %d)\n", - _mesa_lookup_enum_by_nr(mode), count, - _mesa_lookup_enum_by_nr(type), indices, basevertex); - - if (!_mesa_validate_DrawElements( ctx, mode, count, type, indices, - basevertex )) - return; - - vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0, - count, type, indices, basevertex, 1); + count, type, indices, 1); } @@ -975,35 +922,11 @@ _mesa_lookup_enum_by_nr(type), indices, numInstances); if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices, - numInstances, 0)) + numInstances)) return; vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0, - count, type, indices, 0, numInstances); -} - -/** - * Called by glDrawElementsInstancedBaseVertex() in immediate mode. - */ -static void GLAPIENTRY -vbo_exec_DrawElementsInstancedBaseVertex(GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLsizei numInstances, - GLint basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - - if (MESA_VERBOSE & VERBOSE_DRAW) - _mesa_debug(ctx, "glDrawElementsInstancedBaseVertex(%s, %d, %s, %p, %d; %d)\n", - _mesa_lookup_enum_by_nr(mode), count, - _mesa_lookup_enum_by_nr(type), indices, - numInstances, basevertex); - - if (!_mesa_validate_DrawElementsInstanced(ctx, mode, count, type, indices, - numInstances, basevertex)) - return; - - vbo_validated_drawrangeelements(ctx, mode, GL_FALSE, ~0, ~0, - count, type, indices, basevertex, numInstances); + count, type, indices, numInstances); } @@ -1015,8 +938,7 @@ static void vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, - const GLint *basevertex) + const GLvoid **indices, GLsizei primcount) { struct vbo_context *vbo = vbo_context(ctx); struct vbo_exec_context *exec = &vbo->exec; @@ -1097,11 +1019,7 @@ prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size; prim[i].count = count[i]; prim[i].indexed = 1; - prim[i].num_instances = 1; - if (basevertex != NULL) - prim[i].basevertex = basevertex[i]; - else - prim[i].basevertex = 0; + prim[i].num_instances = 1; } check_buffers_are_unmapped(exec->array.inputs); @@ -1124,10 +1042,6 @@ prim[0].count = count[i]; prim[0].indexed = 1; prim[0].num_instances = 1; - if (basevertex != NULL) - prim[0].basevertex = basevertex[i]; - else - prim[0].basevertex = 0; check_buffers_are_unmapped(exec->array.inputs); vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib, @@ -1151,36 +1065,11 @@ ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); for (i = 0; i < primcount; i++) { - if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i], - 0)) + if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i])) return; } - vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount, - NULL); -} - - -static void GLAPIENTRY -vbo_exec_MultiDrawElementsBaseVertex(GLenum mode, - const GLsizei *count, GLenum type, - const GLvoid **indices, - GLsizei primcount, - const GLsizei *basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - GLint i; - - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - for (i = 0; i < primcount; i++) { - if (!_mesa_validate_DrawElements(ctx, mode, count[i], type, indices[i], - basevertex[i])) - return; - } - - vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount, - basevertex); + vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount); } /** @@ -1194,12 +1083,8 @@ exec->vtxfmt.DrawElements = vbo_exec_DrawElements; exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements; exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements; - exec->vtxfmt.DrawElementsBaseVertex = vbo_exec_DrawElementsBaseVertex; - exec->vtxfmt.DrawRangeElementsBaseVertex = vbo_exec_DrawRangeElementsBaseVertex; - exec->vtxfmt.MultiDrawElementsBaseVertex = vbo_exec_MultiDrawElementsBaseVertex; exec->vtxfmt.DrawArraysInstanced = vbo_exec_DrawArraysInstanced; exec->vtxfmt.DrawElementsInstanced = vbo_exec_DrawElementsInstanced; - exec->vtxfmt.DrawElementsInstancedBaseVertex = vbo_exec_DrawElementsInstancedBaseVertex; } @@ -1233,28 +1118,10 @@ void GLAPIENTRY -_mesa_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) -{ - vbo_exec_DrawElementsBaseVertex(mode, count, type, indices, basevertex); -} - - -void GLAPIENTRY _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices) { vbo_exec_DrawRangeElements(mode, start, end, count, type, indices); -} - - -void GLAPIENTRY -_mesa_DrawRangeElementsBaseVertex(GLenum mode, GLuint start, GLuint end, - GLsizei count, GLenum type, - const GLvoid *indices, GLint basevertex) -{ - vbo_exec_DrawRangeElementsBaseVertex(mode, start, end, count, type, - indices, basevertex); } @@ -1265,13 +1132,3 @@ vbo_exec_MultiDrawElements(mode, count, type, indices, primcount); } - -void GLAPIENTRY -_mesa_MultiDrawElementsBaseVertex(GLenum mode, - const GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, - const GLint *basevertex) -{ - vbo_exec_MultiDrawElementsBaseVertex(mode, count, type, indices, - primcount, basevertex); -} Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -371,12 +371,6 @@ { } -static void GLAPIENTRY -_mesa_noop_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, - const GLvoid * indices, GLint basevertex) -{ -} - static void GLAPIENTRY _mesa_noop_DrawRangeElements(GLenum mode, @@ -389,24 +383,6 @@ static void GLAPIENTRY _mesa_noop_MultiDrawElements(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount) -{ -} - -static void GLAPIENTRY -_mesa_noop_DrawRangeElementsBaseVertex(GLenum mode, - GLuint start, GLuint end, - GLsizei count, GLenum type, - const GLvoid * indices, - GLint basevertex) -{ -} - -static void GLAPIENTRY -_mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei * count, - GLenum type, - const GLvoid ** indices, - GLsizei primcount, - const GLint * basevertex) { } @@ -500,9 +476,6 @@ vfmt->DrawElements = _mesa_noop_DrawElements; vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements; vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements; - vfmt->DrawElementsBaseVertex = _mesa_noop_DrawElementsBaseVertex; - vfmt->DrawRangeElementsBaseVertex = _mesa_noop_DrawRangeElementsBaseVertex; - vfmt->MultiDrawElementsBaseVertex = _mesa_noop_MultiDrawElementsBaseVertex; } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -138,22 +138,7 @@ printf("%s %d..%d\n", __FUNCTION__, min_index, max_index); - /* XXX this path is disabled for now. - * There's rendering corruption in some apps when it's enabled. - */ - if (0 && ib && ctx->Extensions.ARB_draw_elements_base_vertex) { - /* If we can just tell the hardware or the TNL to interpret our - * indices with a different base, do so. - */ - tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims); - - for (i = 0; i < nr_prims; i++) { - tmp_prims[i] = prim[i]; - tmp_prims[i].basevertex -= min_index; - } - - prim = tmp_prims; - } else if (ib) { + if (ib) { /* Unfortunately need to adjust each index individually. */ GLboolean map_ib = ib->obj->Name && !ib->obj->Pointer; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -980,40 +980,6 @@ static void GLAPIENTRY -_save_DrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type, - const GLvoid * indices, GLint basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - (void) mode; - (void) count; - (void) type; - (void) indices; - (void) basevertex; - _mesa_compile_error(ctx, GL_INVALID_OPERATION, "glDrawElements"); -} - - -static void GLAPIENTRY -_save_DrawRangeElementsBaseVertex(GLenum mode, - GLuint start, - GLuint end, - GLsizei count, - GLenum type, - const GLvoid * indices, GLint basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - (void) mode; - (void) start; - (void) end; - (void) count; - (void) type; - (void) indices; - (void) basevertex; - _mesa_compile_error(ctx, GL_INVALID_OPERATION, "glDrawRangeElements"); -} - - -static void GLAPIENTRY _save_DrawArrays(GLenum mode, GLint start, GLsizei count) { GET_CURRENT_CONTEXT(ctx); @@ -1039,23 +1005,6 @@ static void GLAPIENTRY -_save_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, - GLenum type, const GLvoid **indices, - GLsizei primcount, const GLint *basevertex) -{ - GET_CURRENT_CONTEXT(ctx); - (void) mode; - (void) count; - (void) type; - (void) indices; - (void) primcount; - (void) basevertex; - _mesa_compile_error(ctx, GL_INVALID_OPERATION, - "glMultiDrawElementsBaseVertex"); -} - - -static void GLAPIENTRY _save_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { GET_CURRENT_CONTEXT(ctx); @@ -1168,7 +1117,7 @@ struct vbo_save_context *save = &vbo_context(ctx)->save; GLint i; - if (!_mesa_validate_DrawElements(ctx, mode, count, type, indices, 0)) + if (!_mesa_validate_DrawElements(ctx, mode, count, type, indices)) return; if (save->out_of_memory) @@ -1216,7 +1165,7 @@ struct vbo_save_context *save = &vbo_context(ctx)->save; if (!_mesa_validate_DrawRangeElements(ctx, mode, - start, end, count, type, indices, 0)) + start, end, count, type, indices)) return; if (save->out_of_memory) @@ -1235,25 +1184,6 @@ for (i = 0; i < primcount; i++) { if (count[i] > 0) { CALL_DrawElements(GET_DISPATCH(), (mode, count[i], type, indices[i])); - } - } -} - - -static void GLAPIENTRY -_save_OBE_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, - GLenum type, - const GLvoid **indices, - GLsizei primcount, - const GLint *basevertex) -{ - GLsizei i; - - for (i = 0; i < primcount; i++) { - if (count[i] > 0) { - CALL_DrawElementsBaseVertex(GET_DISPATCH(), (mode, count[i], type, - indices[i], - basevertex[i])); } } } @@ -1356,10 +1286,7 @@ vfmt->DrawArrays = _save_DrawArrays; vfmt->DrawElements = _save_DrawElements; vfmt->DrawRangeElements = _save_DrawRangeElements; - vfmt->DrawElementsBaseVertex = _save_DrawElementsBaseVertex; - vfmt->DrawRangeElementsBaseVertex = _save_DrawRangeElementsBaseVertex; vfmt->MultiDrawElementsEXT = _save_MultiDrawElements; - vfmt->MultiDrawElementsBaseVertex = _save_MultiDrawElementsBaseVertex; } @@ -1562,7 +1489,6 @@ ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements; ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements; ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _save_OBE_MultiDrawElements; - ctx->ListState.ListVtxfmt.MultiDrawElementsBaseVertex = _save_OBE_MultiDrawElementsBaseVertex; _mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt); } Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -108,14 +108,6 @@ vbo_draw_func draw, const struct split_limits *limits ) { - GLint max_basevertex = prim->basevertex; - GLuint i; - - for (i = 1; i < nr_prims; i++) - max_basevertex = MAX2(max_basevertex, prim[i].basevertex); - - /* XXX max_basevertex is computed but not used, why? */ - if (ib) { if (limits->max_indices == 0) { /* Could traverse the indices, re-emitting vertices in turn. Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c [iso-8859-1] Tue Oct 1 22:44:06 2013 @@ -588,40 +588,28 @@ const struct split_limits *limits ) { struct copy_context copy; - GLuint i, this_nr_prims; - - for (i = 0; i < nr_prims;) { - /* Our SW TNL pipeline doesn't handle basevertex yet, so bind_indices - * will rebase the elements to the basevertex, and we'll only - * emit strings of prims with the same basevertex in one draw call. - */ - for (this_nr_prims = 1; i + this_nr_prims < nr_prims; - this_nr_prims++) { - if (prim[i].basevertex != prim[i + this_nr_prims].basevertex) - break; - } - - memset(&copy, 0, sizeof(copy)); - - /* Require indexed primitives: - */ - assert(ib); - - copy.ctx = ctx; - copy.array = arrays; - copy.prim = &prim[i]; - copy.nr_prims = this_nr_prims; - copy.ib = ib; - copy.draw = draw; - copy.limits = limits; - - /* Clear the vertex cache: - */ - for (i = 0; i < ELT_TABLE_SIZE; i++) - copy.vert_cache[i].in = ~0; - - replay_init(&copy); - replay_elts(&copy); - replay_finish(&copy); - } -} + GLuint i; + + memset(&copy, 0, sizeof(copy)); + + /* Require indexed primitives: + */ + assert(ib); + + copy.ctx = ctx; + copy.array = arrays; + copy.prim = prim; + copy.nr_prims = nr_prims; + copy.ib = ib; + copy.draw = draw; + copy.limits = limits; + + /* Clear the vertex cache: + */ + for (i = 0; i < ELT_TABLE_SIZE; i++) + copy.vert_cache[i].in = ~0; + + replay_init(&copy); + replay_elts(&copy); + replay_finish(&copy); +}

1 0

[akhaldi] 60508: [DEVENUM_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: akhaldi Date: Tue Oct 1 22:09:10 2013 New Revision: 60508 URL: http://svn.reactos.org/svn/reactos?rev=60508&view=rev Log: [DEVENUM_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/devenum/ trunk/rostests/winetests/devenum/CMakeLists.txt (with props) trunk/rostests/winetests/devenum/devenum.c (with props) trunk/rostests/winetests/devenum/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Oct 1 22:09:10 2013 @@ -18,6 +18,7 @@ add_subdirectory(crypt32) add_subdirectory(cryptnet) add_subdirectory(cryptui) +add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dnsapi) add_subdirectory(dplayx) Added: trunk/rostests/winetests/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/CMakeLi… ============================================================================== --- trunk/rostests/winetests/devenum/CMakeLists.txt (added) +++ trunk/rostests/winetests/devenum/CMakeLists.txt [iso-8859-1] Tue Oct 1 22:09:10 2013 @@ -0,0 +1,5 @@ + +add_executable(devenum_winetest devenum.c testlist.c) +set_module_type(devenum_winetest win32cui) +add_importlibs(devenum_winetest oleaut32 ole32 msvcrt kernel32) +add_cd_file(TARGET devenum_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/devenum/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/devenum/devenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/devenum… ============================================================================== --- trunk/rostests/winetests/devenum/devenum.c (added) +++ trunk/rostests/winetests/devenum/devenum.c [iso-8859-1] Tue Oct 1 22:09:10 2013 @@ -0,0 +1,137 @@ +/* + * Some unit tests for devenum + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +//#include <stdio.h> + +#include <wine/test.h> +#include <wingdi.h> +#include <initguid.h> +#include <ole2.h> +#include <strmif.h> +#include <uuids.h> + +static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + +struct category +{ + const char * name; + const GUID * clsid; +}; + +static struct category am_categories[] = +{ + { "Legacy AM Filter category", &CLSID_LegacyAmFilterCategory }, + { "Audio renderer category", &CLSID_AudioRendererCategory }, + { "Midi renderer category", &CLSID_MidiRendererCategory }, + { "Audio input device category", &CLSID_AudioInputDeviceCategory }, + { "Video input device category", &CLSID_VideoInputDeviceCategory }, + { "Audio compressor category", &CLSID_AudioCompressorCategory }, + { "Video compressor category", &CLSID_VideoCompressorCategory } +}; + +static void test_devenum(IBindCtx *bind_ctx) +{ + HRESULT res; + ICreateDevEnum* create_devenum; + IEnumMoniker* enum_moniker = NULL; + int i; + + res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + &IID_ICreateDevEnum, (LPVOID*)&create_devenum); + if (res != S_OK) { + skip("Cannot create SystemDeviceEnum object (%x)\n", res); + return; + } + + for (i = 0; i < (sizeof(am_categories) / sizeof(struct category)); i++) + { + if (winetest_debug > 1) + trace("%s:\n", am_categories[i].name); + + res = ICreateDevEnum_CreateClassEnumerator(create_devenum, am_categories[i].clsid, &enum_moniker, 0); + ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); + if (res == S_OK) + { + IMoniker* moniker; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) + { + IPropertyBag* prop_bag = NULL; + VARIANT var; + HRESULT hr; + + VariantInit(&var); + hr = IMoniker_BindToStorage(moniker, bind_ctx, NULL, &IID_IPropertyBag, (LPVOID*)&prop_bag); + ok(hr == S_OK, "IMoniker_BindToStorage failed with error %x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok((hr == S_OK) || broken(hr == 0x80070002), "IPropertyBag_Read failed with error %x\n", hr); + + if (SUCCEEDED(hr)) + { + if (winetest_debug > 1) + trace(" %s\n", wine_dbgstr_w(V_UNION(&var, bstrVal))); + VariantClear(&var); + } + else + { + trace(" ???\n"); + } + } + + if (prop_bag) + IPropertyBag_Release(prop_bag); + IMoniker_Release(moniker); + } + IEnumMoniker_Release(enum_moniker); + } + } + + ICreateDevEnum_Release(create_devenum); +} + +/* CLSID_CDeviceMoniker */ + +START_TEST(devenum) +{ + IBindCtx *bind_ctx = NULL; + HRESULT hr; + + CoInitialize(NULL); + + test_devenum(NULL); + + /* IBindCtx is allowed in IMoniker_BindToStorage (IMediaCatMoniker_BindToStorage) */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Cannot create BindCtx: (res = 0x%x)\n", hr); + if (bind_ctx) { + test_devenum(bind_ctx); + IBindCtx_Release(bind_ctx); + } + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/devenum/devenum.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/devenum/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/devenum/testlis… ============================================================================== --- trunk/rostests/winetests/devenum/testlist.c (added) +++ trunk/rostests/winetests/devenum/testlist.c [iso-8859-1] Tue Oct 1 22:09:10 2013 @@ -0,0 +1,12 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_devenum(void); + +const struct test winetest_testlist[] = +{ + { "devenum", func_devenum }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/devenum/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 60507: [DEVENUM] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: akhaldi Date: Tue Oct 1 22:07:54 2013 New Revision: 60507 URL: http://svn.reactos.org/svn/reactos?rev=60507&view=rev Log: [DEVENUM] * Sync with Wine 1.7.1. CORE-7469 Added: trunk/reactos/dll/directx/wine/devenum/devenum_classes.idl (with props) trunk/reactos/dll/directx/wine/devenum/devenum_classes.rgs (with props) Removed: trunk/reactos/dll/directx/wine/devenum/Makefile.in Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/dll/directx/wine/devenum/devenum.rc trunk/reactos/dll/directx/wine/devenum/devenum_main.c trunk/reactos/dll/directx/wine/devenum/devenum_private.h trunk/reactos/dll/directx/wine/devenum/factory.c trunk/reactos/dll/directx/wine/devenum/mediacatenum.c trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -2,22 +2,22 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(devenum.dll devenum.spec) -add_library(devenum SHARED +list(APPEND SOURCE createdevenum.c devenum_main.c factory.c mediacatenum.c parsedisplayname.c - devenum.rc ${CMAKE_CURRENT_BINARY_DIR}/devenum.def) +add_library(devenum SHARED ${SOURCE} devenum.rc) +set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) add_pch(devenum devenum_private.h) -add_dependencies(devenum dxsdk) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/directx/wine/devenum/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/M… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/Makefile.in [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/Makefile.in (removed) @@ -1,20 +0,0 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = devenum.dll -IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32 -EXTRALIBS = -lstrmiids -luuid - -C_SRCS = \ - createdevenum.c \ - devenum_main.c \ - factory.c \ - mediacatenum.c \ - parsedisplayname.c - -RC_SRCS = devenum.rc - -@MAKE_DLL_RULES@ - -### Dependencies: Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -52,6 +52,9 @@ static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; +static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR wszWaveInID[] = {'W','a','v','e','I','n','I','D',0}; +static const WCHAR wszWaveOutID[] = {'W','a','v','e','O','u','t','I','D',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); static HRESULT DEVENUM_CreateSpecialCategories(void); @@ -59,24 +62,24 @@ /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface( - ICreateDevEnum * iface, - REFIID riid, - LPVOID *ppvObj) -{ - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - - if (ppvObj == NULL) return E_POINTER; +static HRESULT WINAPI DEVENUM_ICreateDevEnum_QueryInterface(ICreateDevEnum *iface, REFIID riid, + void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ICreateDevEnum)) { - *ppvObj = iface; + *ppv = iface; DEVENUM_ICreateDevEnum_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -171,10 +174,10 @@ for (i1 = 0; i1 < dwMinorTypes; i1++) { WCHAR wszMinorTypeName[64]; - DWORD cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; + cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -349,7 +352,6 @@ HKEY hkeyCategoryBaseKey; WCHAR wszRegKey[MAX_PATH]; HKEY hkeyInstance = NULL; - HRESULT hr; if (RegEnumKeyExW(hkeyFilter, i, wszFilterSubkeyName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; @@ -463,9 +465,8 @@ HKEY hkey; HKEY hbasekey; HRESULT hr; - CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface; - - TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + + TRACE("(%p)->(%s, %p, %x)\n", iface, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags); if (!ppEnumMoniker) return E_POINTER; @@ -519,7 +520,7 @@ /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; +ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) @@ -631,6 +632,7 @@ WAVEINCAPSW wicaps; MIDIOUTCAPSW mocaps; REGPINTYPES * pTypes; + IPropertyBag * pPropBag = NULL; numDevs = waveOutGetNumDevs(); @@ -668,10 +670,27 @@ wocaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) + { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveOutID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wocaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + if (pPropBag) + IPropertyBag_Release(pPropBag); + IMoniker_Release(pMoniker); + pMoniker = NULL; + } wsprintfW(szDSoundName, szDSoundNameFormat, wocaps.szPname); res = IFilterMapper2_RegisterFilter(pMapper, @@ -724,7 +743,7 @@ rfp2.lpMediaType = pTypes; - res = IFilterMapper2_RegisterFilter(pMapper, + res = IFilterMapper2_RegisterFilter(pMapper, &CLSID_AudioRecord, wicaps.szPname, &pMoniker, @@ -732,10 +751,27 @@ wicaps.szPname, &rf2); - /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - - if (pMoniker) - IMoniker_Release(pMoniker); + + if (pMoniker) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_UNION(&var, ulVal) = i; + res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszWaveInID, &var); + else + pPropBag = NULL; + + V_VT(&var) = VT_LPWSTR; + V_UNION(&var, bstrVal) = wicaps.szPname; + if (SUCCEEDED(res)) + res = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); + + if (pPropBag) + IPropertyBag_Release(pPropBag); + IMoniker_Release(pMoniker); + } CoTaskMemFree(pTypes); } @@ -802,7 +838,6 @@ szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) { IMoniker * pMoniker = NULL; - IPropertyBag * pPropBag = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ @@ -833,8 +868,10 @@ V_VT(&var) = VT_I4; V_UNION(&var, ulVal) = i; res = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); - if (SUCCEEDED(res)) - res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + if (SUCCEEDED(res)) { + res = IPropertyBag_Write(pPropBag, wszVfwIndex, &var); + IPropertyBag_Release(pPropBag); + } IMoniker_Release(pMoniker); } Modified: trunk/reactos/dll/directx/wine/devenum/devenum.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum.rc [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -20,9 +20,20 @@ #pragma code_page(65001) -#include "windef.h" +//#include "windef.h" //#include "winbase.h" //#include "winnls.h" +#include "devenum_private.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_DEVENUM_DSDEFAULT "Default DirectSound" + IDS_DEVENUM_DS "DirectSound: %s" + IDS_DEVENUM_WODEFAULT "Default WaveOut Device" + IDS_DEVENUM_MIDEFAULT "Default MidiOut Device" +} LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -33,4 +44,6 @@ #define WINE_PRODUCTVERSION 6,5,1,902 #define WINE_PRODUCTVERSION_STR "6.5" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> + +1 WINE_REGISTRY devenum_classes.rgs Added: trunk/reactos/dll/directx/wine/devenum/devenum_classes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_classes.idl (added) +++ trunk/reactos/dll/directx/wine/devenum/devenum_classes.idl [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -0,0 +1,90 @@ +/* + * COM Classes for devenum + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("System Device Enum"), + threading(both), + uuid(62be5d10-60eb-11d0-bd3b-00a0c911ce86) +] +coclass SystemDeviceEnum { interface ICreateDevEnum; } + +[ + threading(both), + progid("device.1"), + vi_progid("device"), + uuid(4315d437-5b8c-11d0-bd3b-00a0c911ce86) +] +coclass DeviceMoniker { interface IParseDisplayName; } + +[ + helpstring("ACM Class Manager"), + threading(both), + uuid(33d9a761-90c8-11d0-bd43-00a0c911ce86) +] +coclass AudioCompressorCategory { } + +[ + helpstring("ICM Class Manager"), + threading(both), + uuid(33d9a760-90c8-11d0-bd43-00a0c911ce86) +] +coclass VideoCompressorCategory { } + +[ + helpstring("ActiveMovie Filter Class Manager"), + threading(both), + uuid(083863f1-70de-11d0-bd40-00a0c911ce86) +] +coclass LegacyAmFilterCategory { } + +[ + helpstring("VFW Capture Class Manager"), + threading(both), + uuid(860bb310-5d01-11d0-bd3b-00a0c911ce86) +] +coclass VideoInputDeviceCategory { } + +[ + helpstring("WaveIn Class Manager"), + threading(both), + uuid(33d9a762-90c8-11d0-bd43-00a0c911ce86) +] +coclass AudioInputDeviceCategory { } + +[ + helpstring("WaveOut and DSound Class Manager"), + threading(both), + uuid(e0f158e1-cb04-11d0-bd4e-00a0c911ce86) +] +coclass AudioRendererCategory { } + +[ + helpstring("MidiOut Class Manager"), + threading(both), + uuid(4efe2452-168a-11d1-bc76-00c04fb9453b) +] +coclass MidiRendererCategory { } + +[ + helpstring("ActiveMovie Filter Categories"), + threading(both), + uuid(da4e3da0-d07d-11d0-bd50-00a0c911ce86) +] +coclass ActiveMovieCategories { } Propchange: trunk/reactos/dll/directx/wine/devenum/devenum_classes.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/wine/devenum/devenum_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_classes.rgs (added) +++ trunk/reactos/dll/directx/wine/devenum/devenum_classes.rgs [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -0,0 +1,60 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{62BE5D10-60EB-11D0-BD3B-00A0C911CE86}' = s 'System Device Enum' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{4315D437-5B8C-11D0-BD3B-00A0C911CE86}' = s 'DeviceMoniker' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + ProgId = s 'device.1' + VersionIndependentProgId = s 'device' + } + '{33D9A761-90C8-11D0-BD43-00A0C911CE86}' = s 'ACM Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{33D9A760-90C8-11D0-BD43-00A0C911CE86}' = s 'ICM Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{083863F1-70DE-11D0-BD40-00A0C911CE86}' = s 'ActiveMovie Filter Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{860BB310-5D01-11D0-BD3B-00A0C911CE86}' = s 'VFW Capture Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{33D9A762-90C8-11D0-BD43-00A0C911CE86}' = s 'WaveIn Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{E0F158E1-CB04-11D0-BD4E-00A0C911CE86}' = s 'WaveOut and DSound Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{4EFE2452-168A-11D1-BC76-00C04FB9453B}' = s 'MidiOut Class Manager' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + '{DA4E3DA0-D07D-11D0-BD50-00A0C911CE86}' = s 'ActiveMovie Filter Categories' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } + } + } + 'device.1' = s 'DeviceMoniker' + { + CLSID = s '{4315D437-5B8C-11D0-BD3B-00A0C911CE86}' + } + 'device' = s 'DeviceMoniker' + { + CLSID = s '{4315D437-5B8C-11D0-BD3B-00A0C911CE86}' + CurVer = s 'device.1' + } +} Propchange: trunk/reactos/dll/directx/wine/devenum/devenum_classes.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -20,13 +20,13 @@ */ #include "devenum_private.h" +#include <rpcproxy.h> #include <wine/debug.h> -//#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(devenum); -LONG dll_refs; -HINSTANCE DEVENUM_hInstance; +DECLSPEC_HIDDEN LONG dll_refs; +DECLSPEC_HIDDEN HINSTANCE DEVENUM_hInstance; typedef struct { @@ -35,7 +35,6 @@ BOOL instance; } register_info; -static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWSTR pszThreadingModel); static void DEVENUM_RegisterQuartz(void); /*********************************************************************** @@ -55,10 +54,6 @@ DEVENUM_hInstance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); break; - - case DLL_PROCESS_DETACH: - DEVENUM_hInstance = 0; - break; } return TRUE; } @@ -76,7 +71,7 @@ * Oh well - works just fine as it is */ if (IsEqualGUID(rclsid, &CLSID_SystemDeviceEnum) || IsEqualGUID(rclsid, &CLSID_CDeviceMoniker)) - return IClassFactory_QueryInterface((IClassFactory*)&DEVENUM_ClassFactory, iid, ppv); + return IClassFactory_QueryInterface(&DEVENUM_ClassFactory.IClassFactory_iface, iid, ppv); FIXME("CLSID: %s, IID: %s\n", debugstr_guid(rclsid), debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; @@ -96,42 +91,12 @@ HRESULT WINAPI DllRegisterServer(void) { HRESULT res; - HKEY hkeyClsid = NULL; - HKEY hkey1 = NULL; - HKEY hkey2 = NULL; - LPOLESTR pszClsidDevMon = NULL; IFilterMapper2 * pMapper = NULL; LPVOID mapvptr; - static const WCHAR threadingModel[] = {'B','o','t','h',0}; - static const WCHAR sysdevenum[] = {'S','y','s','t','e','m',' ','D','e','v','i','c','e',' ','E','n','u','m',0}; - static const WCHAR devmon[] = {'D','e','v','i','c','e','M','o','n','i','k','e','r',0}; - static const WCHAR acmcat[] = {'A','C','M',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR vidcat[] = {'I','C','M',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR filtcat[] = {'A','c','t','i','v','e','M','o','v','i','e',' ','F','i','l','t','e','r',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR vfwcat[] = {'V','F','W',' ','C','a','p','t','u','r','e',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR wavein[] = {'W','a','v','e','I','n',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r', 0}; - static const WCHAR waveout[] = {'W','a','v','e','O','u','t',' ','a','n','d',' ','D','S','o','u','n','d',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR midiout[] = {'M','i','d','i','O','u','t',' ','C','l','a','s','s',' ','M','a','n','a','g','e','r',0}; - static const WCHAR amcat[] = {'A','c','t','i','v','e','M','o','v','i','e',' ','F','i','l','t','e','r',' ','C','a','t','e','g','o','r','i','e','s',0}; - static const WCHAR device[] = {'d','e','v','i','c','e',0}; - static const WCHAR device_1[] = {'d','e','v','i','c','e','.','1',0}; - static const register_info ri[] = - { - {&CLSID_SystemDeviceEnum, sysdevenum, FALSE}, - {&CLSID_CDeviceMoniker, devmon, FALSE}, - {&CLSID_AudioCompressorCategory, acmcat, TRUE}, - {&CLSID_VideoCompressorCategory, vidcat, TRUE}, - {&CLSID_LegacyAmFilterCategory, filtcat, TRUE}, - {&CLSID_VideoInputDeviceCategory, vfwcat, FALSE}, - {&CLSID_AudioInputDeviceCategory, wavein, FALSE}, - {&CLSID_AudioRendererCategory, waveout, FALSE}, - {&CLSID_MidiRendererCategory, midiout, FALSE}, - {&CLSID_ActiveMovieCategories, amcat, TRUE} - }; TRACE("\n"); - res = register_clsids(sizeof(ri) / sizeof(register_info), ri, threadingModel); + res = __wine_register_resources( DEVENUM_hInstance ); /* Quartz is needed for IFilterMapper2 */ DEVENUM_RegisterQuartz(); @@ -169,116 +134,6 @@ IFilterMapper2_Release(pMapper); } -/*** CDeviceMoniker ***/ - if (SUCCEEDED(res)) - { - res = StringFromCLSID(&CLSID_CDeviceMoniker, &pszClsidDevMon); - } - if (SUCCEEDED(res)) - { - res = RegOpenKeyW(HKEY_CLASSES_ROOT, clsid_keyname, &hkeyClsid) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegOpenKeyW(hkeyClsid, pszClsidDevMon, &hkey1) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - static const WCHAR wszProgID[] = {'P','r','o','g','I','D',0}; - res = RegCreateKeyW(hkey1, wszProgID, &hkey2) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegSetValueW(hkey2, NULL, REG_SZ, device_1, (lstrlenW(device_1) + 1) * sizeof(WCHAR)) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - - if (hkey2) - { - RegCloseKey(hkey2); - hkey2 = NULL; - } - - if (SUCCEEDED(res)) - { - static const WCHAR wszVProgID[] = {'V','e','r','s','i','o','n','I','n','d','e','p','e','d','e','n','t','P','r','o','g','I','D',0}; - res = RegCreateKeyW(hkey1, wszVProgID, &hkey2) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegSetValueW(hkey2, NULL, REG_SZ, device, (lstrlenW(device) + 1) * sizeof(WCHAR)) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - - if (hkey2) - { - RegCloseKey(hkey2); - hkey2 = NULL; - } - - if (hkey1) - { - RegCloseKey(hkey1); - hkey1 = NULL; - } - - if (SUCCEEDED(res)) - { - res = RegCreateKeyW(HKEY_CLASSES_ROOT, device, &hkey1) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegCreateKeyW(hkey1, clsid_keyname, &hkey2) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegSetValueW(hkey2, NULL, REG_SZ, pszClsidDevMon, (lstrlenW(pszClsidDevMon) + 1) * sizeof(WCHAR)) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (hkey2) - { - RegCloseKey(hkey2); - hkey2 = NULL; - } - - if (hkey1) - { - RegCloseKey(hkey1); - hkey1 = NULL; - } - - if (SUCCEEDED(res)) - { - res = RegCreateKeyW(HKEY_CLASSES_ROOT, device_1, &hkey1) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegCreateKeyW(hkey1, clsid_keyname, &hkey2) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - res = RegSetValueW(hkey2, NULL, REG_SZ, pszClsidDevMon, (lstrlenW(pszClsidDevMon) + 1) * sizeof(WCHAR)) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - - if (hkey2) - RegCloseKey(hkey2); - - if (hkey1) - RegCloseKey(hkey1); - - if (hkeyClsid) - RegCloseKey(hkeyClsid); - - CoTaskMemFree(pszClsidDevMon); CoUninitialize(); return res; @@ -289,77 +144,8 @@ */ HRESULT WINAPI DllUnregisterServer(void) { - FIXME("stub!\n"); - return E_FAIL; -} - -static HRESULT register_clsids(int count, const register_info * pRegInfo, LPCWSTR pszThreadingModel) -{ - HRESULT res = S_OK; - LPOLESTR clsidString = NULL; - HKEY hkeyClsid; - HKEY hkeySub; - HKEY hkeyInproc32; - HKEY hkeyInstance = NULL; - int i; - static const WCHAR wcszInproc32[] = {'I','n','p','r','o','c','S','e','r','v','e','r','3','2',0}; - static const WCHAR wcszThreadingModel[] = {'T','h','r','e','a','d','i','n','g','M','o','d','e','l',0}; - static const WCHAR dll_module[] = {'d','e','v','e','n','u','m','.','d','l','l',0}; - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, clsid_keyname, &hkeyClsid) - == ERROR_SUCCESS ? S_OK : E_FAIL; - - for (i = 0; i < count; i++) - { - hkeySub = 0; - if (SUCCEEDED(res)) - { - res = StringFromCLSID(pRegInfo[i].clsid, &clsidString); - } - if (SUCCEEDED(res)) - { - res = RegCreateKeyW(hkeyClsid, clsidString, &hkeySub) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (pRegInfo[i].instance && SUCCEEDED(res)) - { - res = RegCreateKeyW(hkeySub, wszInstanceKeyName, &hkeyInstance) - == ERROR_SUCCESS ? S_OK : E_FAIL; - RegCloseKey(hkeyInstance); - } - if (SUCCEEDED(res)) - { - RegSetValueW(hkeySub, - NULL, - REG_SZ, - pRegInfo->friendly_name ? pRegInfo[i].friendly_name : clsidString, - (lstrlenW(pRegInfo[i].friendly_name ? pRegInfo->friendly_name : clsidString) + 1) * sizeof(WCHAR)); - res = RegCreateKeyW(hkeySub, wcszInproc32, &hkeyInproc32) - == ERROR_SUCCESS ? S_OK : E_FAIL; - } - if (SUCCEEDED(res)) - { - RegSetValueW(hkeyInproc32, - NULL, - REG_SZ, - dll_module, - (lstrlenW(dll_module) + 1) * sizeof(WCHAR)); - RegSetValueExW(hkeyInproc32, - wcszThreadingModel, - 0, - REG_SZ, - (LPCVOID)pszThreadingModel, - (lstrlenW(pszThreadingModel) + 1) * sizeof(WCHAR)); - RegCloseKey(hkeyInproc32); - } - if (hkeySub) RegCloseKey(hkeySub); - CoTaskMemFree(clsidString); - clsidString = NULL; - } - - RegCloseKey(hkeyClsid); - - return res; + FIXME("stub!\n"); + return __wine_unregister_resources( DEVENUM_hInstance ); } typedef HRESULT (WINAPI *DllRegisterServer_func)(void); Modified: trunk/reactos/dll/directx/wine/devenum/devenum_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/d… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/devenum_private.h [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -51,7 +51,7 @@ /********************************************************************** * Dll lifetime tracking declaration for devenum.dll */ -extern LONG dll_refs; +extern LONG dll_refs DECLSPEC_HIDDEN; static inline void DEVENUM_LockModule(void) { InterlockedIncrement(&dll_refs); } static inline void DEVENUM_UnlockModule(void) { InterlockedDecrement(&dll_refs); } @@ -61,45 +61,27 @@ */ typedef struct { - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; } ClassFactoryImpl; typedef struct { - const ICreateDevEnumVtbl *lpVtbl; -} CreateDevEnumImpl; - -typedef struct -{ - const IParseDisplayNameVtbl *lpVtbl; -} ParseDisplayNameImpl; - -typedef struct -{ - const IEnumMonikerVtbl *lpVtbl; - LONG ref; - DWORD index; - HKEY hkey; -} EnumMonikerImpl; - -typedef struct -{ - const IMonikerVtbl *lpVtbl; + IMoniker IMoniker_iface; LONG ref; HKEY hkey; } MediaCatMoniker; -MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void); -HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker); +MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; +HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; -extern ClassFactoryImpl DEVENUM_ClassFactory; -extern CreateDevEnumImpl DEVENUM_CreateDevEnum; -extern ParseDisplayNameImpl DEVENUM_ParseDisplayName; +extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; +extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; +extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; /********************************************************************** * Private helper function to get AM filter category key location */ -HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen); +HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) DECLSPEC_HIDDEN; /********************************************************************** * Global string constant declarations Modified: trunk/reactos/dll/directx/wine/devenum/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/f… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/factory.c [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -28,12 +28,10 @@ /********************************************************************** * DEVENUM_IClassFactory_QueryInterface (also IUnknown) */ -static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface( - LPCLASSFACTORY iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, + void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER; @@ -56,7 +54,7 @@ /********************************************************************** * DEVENUM_IClassFactory_AddRef (also IUnknown) */ -static ULONG WINAPI DEVENUM_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DEVENUM_IClassFactory_AddRef(IClassFactory *iface) { TRACE("\n"); @@ -68,7 +66,7 @@ /********************************************************************** * DEVENUM_IClassFactory_Release (also IUnknown) */ -static ULONG WINAPI DEVENUM_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DEVENUM_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); @@ -80,13 +78,10 @@ /********************************************************************** * DEVENUM_IClassFactory_CreateInstance */ -static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IClassFactory_CreateInstance(IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, void **ppvObj) { - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + TRACE("(%p)->(%p, %s, %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppvObj); if (ppvObj == NULL) return E_POINTER; @@ -110,9 +105,7 @@ /********************************************************************** * DEVENUM_IClassFactory_LockServer */ -static HRESULT WINAPI DEVENUM_IClassFactory_LockServer( - LPCLASSFACTORY iface, - BOOL fLock) +static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { TRACE("\n"); @@ -138,4 +131,4 @@ /********************************************************************** * static ClassFactory instance */ -ClassFactoryImpl DEVENUM_ClassFactory = { &IClassFactory_Vtbl }; +ClassFactoryImpl DEVENUM_ClassFactory = { { &IClassFactory_Vtbl } }; Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/m… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -30,24 +30,33 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface); -static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface); -static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface); - typedef struct { - const IPropertyBagVtbl *lpVtbl; + IEnumMoniker IEnumMoniker_iface; + LONG ref; + DWORD index; + HKEY hkey; +} EnumMonikerImpl; + +typedef struct +{ + IPropertyBag IPropertyBag_iface; LONG ref; HKEY hkey; } RegPropBagImpl; + +static inline RegPropBagImpl *impl_from_IPropertyBag(IPropertyBag *iface) +{ + return CONTAINING_RECORD(iface, RegPropBagImpl, IPropertyBag_iface); +} static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( LPPROPERTYBAG iface, REFIID riid, LPVOID *ppvObj) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); @@ -57,7 +66,7 @@ IsEqualGUID(riid, &IID_IPropertyBag)) { *ppvObj = iface; - DEVENUM_IPropertyBag_AddRef(iface); + IPropertyBag_AddRef(iface); return S_OK; } @@ -70,7 +79,7 @@ */ static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); TRACE("(%p)->() AddRef from %d\n", iface, This->ref); @@ -82,7 +91,7 @@ */ static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); ULONG ref; TRACE("(%p)->() ReleaseThis->ref from %d\n", iface, This->ref); @@ -105,7 +114,7 @@ LPVOID pData = NULL; DWORD received; DWORD type = 0; - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); HRESULT res = S_OK; LONG reswin32; @@ -212,7 +221,7 @@ LPCOLESTR pszPropName, VARIANT* pVar) { - RegPropBagImpl *This = (RegPropBagImpl *)iface; + RegPropBagImpl *This = impl_from_IPropertyBag(iface); LPVOID lpData = NULL; DWORD cbData = 0; DWORD dwType = 0; @@ -223,6 +232,7 @@ switch (V_VT(pVar)) { case VT_BSTR: + case VT_LPWSTR: TRACE("writing %s\n", debugstr_w(V_UNION(pVar, bstrVal))); lpData = V_UNION(pVar, bstrVal); dwType = REG_SZ; @@ -277,62 +287,60 @@ RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) return E_OUTOFMEMORY; - rpb->lpVtbl = &IPropertyBag_Vtbl; + rpb->IPropertyBag_iface.lpVtbl = &IPropertyBag_Vtbl; rpb->ref = 1; rpb->hkey = hkey; - *ppBag = (IPropertyBag*)rpb; + *ppBag = &rpb->IPropertyBag_iface; DEVENUM_LockModule(); return S_OK; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface( - LPMONIKER iface, - REFIID riid, - LPVOID *ppvObj) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; +static inline MediaCatMoniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, MediaCatMoniker, IMoniker_iface); +} + +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_QueryInterface(IMoniker *iface, REFIID riid, + void **ppv) +{ TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (This == NULL || ppvObj == NULL) return E_POINTER; - - *ppvObj = NULL; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IPersist) || IsEqualGUID(riid, &IID_IPersistStream) || IsEqualGUID(riid, &IID_IMoniker)) { - *ppvObj = iface; - DEVENUM_IMediaCatMoniker_AddRef(iface); + *ppv = iface; + IMoniker_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IMediaCatMoniker_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(LPMONIKER iface) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; - TRACE("\n"); - - return InterlockedIncrement(&This->ref); -} - -/********************************************************************** - * DEVENUM_IMediaCatMoniker_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(LPMONIKER iface) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; - ULONG ref; - TRACE("\n"); - - ref = InterlockedDecrement(&This->ref); +static ULONG WINAPI DEVENUM_IMediaCatMoniker_AddRef(IMoniker *iface) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + if (ref == 0) { RegCloseKey(This->hkey); CoTaskMemFree(This); @@ -341,11 +349,10 @@ return ref; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID( - LPMONIKER iface, - CLSID* pClassID) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID(IMoniker *iface, CLSID *pClassID) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); + FIXME("(%p)->(%p): stub\n", This, pClassID); if (pClassID == NULL) @@ -354,30 +361,28 @@ return E_NOTIMPL; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsDirty(LPMONIKER iface) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsDirty(IMoniker *iface) { FIXME("(%p)->(): stub\n", iface); return S_FALSE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Load(LPMONIKER iface, IStream* pStm) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Load(IMoniker *iface, IStream *pStm) { FIXME("(%p)->(%p): stub\n", iface, pStm); return E_NOTIMPL; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Save(LPMONIKER iface, IStream* pStm, BOOL fClearDirty) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Save(IMoniker *iface, IStream *pStm, BOOL fClearDirty) { FIXME("(%p)->(%p, %s): stub\n", iface, pStm, fClearDirty ? "true" : "false"); return STG_E_CANTSAVE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetSizeMax( - LPMONIKER iface, - ULARGE_INTEGER* pcbSize) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSize) { FIXME("(%p)->(%p): stub\n", iface, pcbSize); @@ -386,25 +391,19 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riidResult, - void** ppvResult) -{ +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToObject(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); IUnknown * pObj = NULL; IPropertyBag * pProp = NULL; CLSID clsID; VARIANT var; HRESULT res = E_FAIL; - MediaCatMoniker *This = (MediaCatMoniker *)iface; + TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); VariantInit(&var); - - TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult); - *ppvResult = NULL; if(pmkToLeft==NULL) @@ -458,20 +457,27 @@ return res; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - REFIID riid, - void** ppvObj) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, REFIID riid, void **ppvObj) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); + TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); *ppvObj = NULL; - if (pbc || pmkToLeft) + if (pmkToLeft) return MK_E_NOSTORAGE; + + if (pbc != NULL) + { + static DWORD reported; + if (!reported) + { + FIXME("ignoring IBindCtx %p\n", pbc); + reported++; + } + } if (IsEqualGUID(riid, &IID_IPropertyBag)) { @@ -483,12 +489,8 @@ return MK_E_NOSTORAGE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Reduce( - LPMONIKER iface, - IBindCtx* pbc, - DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, - IMoniker** ppmkReduced) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Reduce(IMoniker *iface, IBindCtx *pbc, + DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced) { TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); @@ -499,11 +501,8 @@ return MK_S_REDUCED_TO_SELF; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ComposeWith( - LPMONIKER iface, - IMoniker* pmkRight, - BOOL fOnlyIfNotGeneric, - IMoniker** ppmkComposite) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ComposeWith(IMoniker *iface, IMoniker *pmkRight, + BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite) { FIXME("(%p)->(%p, %s, %p): stub\n", iface, pmkRight, fOnlyIfNotGeneric ? "true" : "false", ppmkComposite); @@ -513,10 +512,8 @@ return E_NOTIMPL; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Enum( - LPMONIKER iface, - BOOL fForward, - IEnumMoniker** ppenumMoniker) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Enum(IMoniker *iface, BOOL fForward, + IEnumMoniker **ppenumMoniker) { FIXME("(%p)->(%s, %p): stub\n", iface, fForward ? "true" : "false", ppenumMoniker); @@ -525,18 +522,14 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsEqual( - LPMONIKER iface, - IMoniker* pmkOtherMoniker) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsEqual(IMoniker *iface, IMoniker *pmkOtherMoniker) { FIXME("(%p)->(%p): stub\n", iface, pmkOtherMoniker); return E_NOTIMPL; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Hash( - LPMONIKER iface, - DWORD* pdwHash) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Hash(IMoniker *iface, DWORD *pdwHash) { TRACE("(%p)->(%p)\n", iface, pdwHash); @@ -545,22 +538,16 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsRunning( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - IMoniker* pmkNewlyRunning) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsRunning(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning) { FIXME("(%p)->(%p, %p, %p): stub\n", iface, pbc, pmkToLeft, pmkNewlyRunning); return S_FALSE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetTimeOfLastChange( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - FILETIME* pFileTime) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetTimeOfLastChange(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, FILETIME *pFileTime) { TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, pFileTime); @@ -570,9 +557,7 @@ return MK_E_UNAVAILABLE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Inverse( - LPMONIKER iface, - IMoniker** ppmk) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Inverse(IMoniker *iface, IMoniker **ppmk) { TRACE("(%p)->(%p)\n", iface, ppmk); @@ -581,10 +566,8 @@ return MK_E_NOINVERSE; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_CommonPrefixWith( - LPMONIKER iface, - IMoniker* pmkOtherMoniker, - IMoniker** ppmkPrefix) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_CommonPrefixWith(IMoniker *iface, + IMoniker *pmkOtherMoniker, IMoniker **ppmkPrefix) { TRACE("(%p)->(%p, %p)\n", iface, pmkOtherMoniker, ppmkPrefix); @@ -593,10 +576,8 @@ return MK_E_NOPREFIX; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo( - LPMONIKER iface, - IMoniker* pmkOther, - IMoniker** ppmkRelPath) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther, + IMoniker **ppmkRelPath) { TRACE("(%p)->(%p, %p)\n", iface, pmkOther, ppmkRelPath); @@ -605,13 +586,10 @@ return MK_S_HIM; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR* ppszDisplayName) -{ - MediaCatMoniker *This = (MediaCatMoniker *)iface; +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) +{ + MediaCatMoniker *This = impl_from_IMoniker(iface); WCHAR wszBuffer[MAX_PATH]; static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; LONG received = sizeof(wszFriendlyName); @@ -631,13 +609,8 @@ return E_FAIL; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName( - LPMONIKER iface, - IBindCtx* pbc, - IMoniker* pmkToLeft, - LPOLESTR pszDisplayName, - ULONG* pchEaten, - IMoniker** ppmkOut) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName(IMoniker *iface, IBindCtx *pbc, + IMoniker *pmkToLeft, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { FIXME("(%p)->(%p, %p, %s, %p, %p)\n", iface, pbc, pmkToLeft, debugstr_w(pszDisplayName), pchEaten, ppmkOut); @@ -647,9 +620,7 @@ return MK_E_SYNTAX; } -static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker( - LPMONIKER iface, - DWORD* pdwMksys) +static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker(IMoniker *iface, DWORD *pdwMksys) { TRACE("(%p)->(%p)\n", iface, pdwMksys); @@ -690,65 +661,59 @@ if (!pMoniker) return NULL; - pMoniker->lpVtbl = &IMoniker_Vtbl; + pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; pMoniker->ref = 0; pMoniker->hkey = NULL; - DEVENUM_IMediaCatMoniker_AddRef((LPMONIKER)pMoniker); + DEVENUM_IMediaCatMoniker_AddRef(&pMoniker->IMoniker_iface); DEVENUM_LockModule(); return pMoniker; } -/********************************************************************** - * DEVENUM_IEnumMoniker_QueryInterface (also IUnknown) - */ -static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( - LPENUMMONIKER iface, - REFIID riid, - LPVOID *ppvObj) -{ - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); - - if (This == NULL || ppvObj == NULL) return E_POINTER; +static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface) +{ + return CONTAINING_RECORD(iface, EnumMonikerImpl, IEnumMoniker_iface); +} + +static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface(IEnumMoniker *iface, REFIID riid, + void **ppv) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumMoniker)) { - *ppvObj = iface; - DEVENUM_IEnumMoniker_AddRef(iface); + *ppv = iface; + IEnumMoniker_AddRef(iface); return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IEnumMoniker_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(LPENUMMONIKER iface) -{ - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; +static ULONG WINAPI DEVENUM_IEnumMoniker_AddRef(IEnumMoniker *iface) +{ + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->() AddRef from %d\n", iface, ref - 1); + TRACE("(%p) ref=%d\n", This, ref); return ref; } -/********************************************************************** - * DEVENUM_IEnumMoniker_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IEnumMoniker_Release(LPENUMMONIKER iface) -{ - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; +static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) +{ + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->() Release from %d\n", iface, ref + 1); + TRACE("(%p) ref=%d\n", This, ref); if (!ref) { @@ -760,13 +725,14 @@ return ref; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) -{ +static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, IMoniker **rgelt, + ULONG *pceltFetched) +{ + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; LONG res; ULONG fetched = 0; MediaCatMoniker * pMoniker; - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -783,10 +749,10 @@ if (RegOpenKeyW(This->hkey, buffer, &pMoniker->hkey) != ERROR_SUCCESS) { - DEVENUM_IMediaCatMoniker_Release((LPMONIKER)pMoniker); + IMoniker_Release(&pMoniker->IMoniker_iface); break; } - rgelt[fetched] = (LPMONIKER)pMoniker; + rgelt[fetched] = &pMoniker->IMoniker_iface; fetched++; } @@ -803,15 +769,15 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(LPENUMMONIKER iface, ULONG celt) -{ - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; +static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) +{ + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); DWORD subKeys; TRACE("(%p)->(%d)\n", iface, celt); - /* Before incrementing, check if there are any more values to run thru. - Some programs use the Skip() function to get the amount of devices */ + /* Before incrementing, check if there are any more values to run through. + Some programs use the Skip() function to get the number of devices */ if(RegQueryInfoKeyW(This->hkey, NULL, NULL, NULL, &subKeys, NULL, NULL, NULL, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) { return S_FALSE; @@ -826,9 +792,9 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(LPENUMMONIKER iface) -{ - EnumMonikerImpl *This = (EnumMonikerImpl *)iface; +static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(IEnumMoniker *iface) +{ + EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); TRACE("(%p)->()\n", iface); @@ -837,7 +803,7 @@ return S_OK; } -static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMoniker ** ppenum) +static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(IEnumMoniker *iface, IEnumMoniker **ppenum) { FIXME("(%p)->(%p): stub\n", iface, ppenum); @@ -864,12 +830,12 @@ if (!pEnumMoniker) return E_OUTOFMEMORY; - pEnumMoniker->lpVtbl = &IEnumMoniker_Vtbl; + pEnumMoniker->IEnumMoniker_iface.lpVtbl = &IEnumMoniker_Vtbl; pEnumMoniker->ref = 1; pEnumMoniker->index = 0; pEnumMoniker->hkey = hkey; - *ppEnumMoniker = (IEnumMoniker *)pEnumMoniker; + *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; DEVENUM_LockModule(); Modified: trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/p… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/parsedisplayname.c [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -27,31 +27,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface( - LPPARSEDISPLAYNAME iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI DEVENUM_IParseDisplayName_QueryInterface(IParseDisplayName *iface, + REFIID riid, void **ppv) { TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); - if (ppvObj == NULL) return E_POINTER; + if (!ppv) + return E_POINTER; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IParseDisplayName)) { - *ppvObj = iface; - IParseDisplayName_AddRef(iface); - return S_OK; + *ppv = iface; + IParseDisplayName_AddRef(iface); + return S_OK; } FIXME("- no interface IID: %s\n", debugstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } -/********************************************************************** - * DEVENUM_IParseDisplayName_AddRef (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_AddRef(IParseDisplayName *iface) { TRACE("\n"); @@ -60,10 +57,7 @@ return 2; /* non-heap based object */ } -/********************************************************************** - * DEVENUM_IParseDisplayName_Release (also IUnknown) - */ -static ULONG WINAPI DEVENUM_IParseDisplayName_Release(LPPARSEDISPLAYNAME iface) +static ULONG WINAPI DEVENUM_IParseDisplayName_Release(IParseDisplayName *iface) { TRACE("\n"); @@ -81,12 +75,8 @@ * Might not handle more complicated strings properly (ie anything * not in "@device:sw:{CLSID1}\<filter name or CLSID>" format */ -static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( - LPPARSEDISPLAYNAME iface, - IBindCtx *pbc, - LPOLESTR pszDisplayName, - ULONG *pchEaten, - IMoniker **ppmkOut) +static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { LPOLESTR pszBetween = NULL; LPOLESTR pszClass = NULL; @@ -136,10 +126,10 @@ strcatW(wszRegKeyName, pszBetween); if (RegCreateKeyW(hbasekey, wszRegKeyName, &pMoniker->hkey) == ERROR_SUCCESS) - *ppmkOut = (LPMONIKER)pMoniker; + *ppmkOut = &pMoniker->IMoniker_iface; else { - IMoniker_Release((LPMONIKER)pMoniker); + IMoniker_Release(&pMoniker->IMoniker_iface); res = MK_E_NOOBJECT; } } @@ -163,4 +153,4 @@ }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl }; +IParseDisplayName DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl }; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Oct 1 22:07:54 2013 @@ -34,6 +34,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1 reactos/dll/directx/wine/d3dxof # Synced to Wine-1.7.1 reactos/dll/directx/wine/ddraw # Synced to Wine-1.7.1 +reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26

1 0

[akhaldi] 60506: [DEVENUM] * Move to directx/wine. CORE-7495 #resolve
by akhaldi＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: akhaldi Date: Tue Oct 1 21:49:43 2013 New Revision: 60506 URL: http://svn.reactos.org/svn/reactos?rev=60506&view=rev Log: [DEVENUM] * Move to directx/wine. CORE-7495 #resolve Added: trunk/reactos/dll/directx/wine/devenum/ - copied from r60504, trunk/reactos/dll/directx/devenum/ Removed: trunk/reactos/dll/directx/devenum/ Modified: trunk/reactos/dll/directx/CMakeLists.txt trunk/reactos/dll/directx/wine/CMakeLists.txt Modified: trunk/reactos/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt… ============================================================================== --- trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/CMakeLists.txt [iso-8859-1] Tue Oct 1 21:49:43 2013 @@ -4,7 +4,6 @@ #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder #add_subdirectory(ddraw) #disabled in trunk, see wine subfolder -add_subdirectory(devenum) #add_subdirectory(dsound_new) #disabled in trunk #add_subdirectory(ksproxy) Not needed at the moment add_subdirectory(ksuser) Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList… ============================================================================== --- trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/CMakeLists.txt [iso-8859-1] Tue Oct 1 21:49:43 2013 @@ -25,6 +25,7 @@ add_subdirectory(d3dx9_43) add_subdirectory(d3dxof) add_subdirectory(ddraw) +add_subdirectory(devenum) add_subdirectory(dinput) add_subdirectory(dinput8) add_subdirectory(dmusic)

1 0

[jgardou] 60505: [[MESA] - leaner build part 6 of X - Get rid of the ARB_blend_func_extended, ARB_explicit_attrib_location, ARB_seamless_cube_map, ARB_texture_multisample extension EXT_provoking_ve...
by jgardou＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: jgardou Date: Tue Oct 1 21:37:39 2013 New Revision: 60505 URL: http://svn.reactos.org/svn/reactos?rev=60505&view=rev Log: [[MESA] - leaner build part 6 of X - Get rid of the ARB_blend_func_extended, ARB_explicit_attrib_location, ARB_seamless_cube_map, ARB_texture_multisample extension EXT_provoking_vertex, EXT_vertex_array_bgra and AMD_seamless_cubemap_per_texture extensions #CORE-7499 Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp trunk/reactos/dll/opengl/mesa/src/glsl/main.cpp trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/arrayobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.h trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h trunk/reactos/dll/opengl/mesa/src/mesa/main/light.c trunk/reactos/dll/opengl/mesa/src/mesa/main/light.h trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.h trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/a… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/l… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/arrayobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/glheader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/light.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_rendertmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v…

1 0

[jgardou] 60504: [[MESA] - leaner build part 5 of X - Fix build from part 4 (damn you tortoiseSVN) - Get rid of the ARB_instanced_arrays extension
by jgardou＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: jgardou Date: Tue Oct 1 19:43:16 2013 New Revision: 60504 URL: http://svn.reactos.org/svn/reactos?rev=60504&view=rev Log: [[MESA] - leaner build part 5 of X - Fix build from part 4 (damn you tortoiseSVN) - Get rid of the ARB_instanced_arrays extension Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -691,9 +691,6 @@ SET_GetStringi(exec, _mesa_GetStringi); SET_ClampColor(exec, _mesa_ClampColorARB); - /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor); - /* GL_ARB_draw_buffer_blend */ SET_BlendFunciARB(exec, _mesa_BlendFunci); SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -508,7 +508,6 @@ #define _gloffset_FramebufferTexture 437 #define _gloffset_GetBufferParameteri64v 438 #define _gloffset_GetInteger64i_v 439 -#define _gloffset_VertexAttribDivisor 440 #define _gloffset_LoadTransposeMatrixdARB 441 #define _gloffset_LoadTransposeMatrixfARB 442 #define _gloffset_MultTransposeMatrixdARB 443 @@ -639,7 +638,6 @@ #define _gloffset_FramebufferTextureARB 576 #define _gloffset_FramebufferTextureFaceARB 577 #define _gloffset_ProgramParameteriARB 578 -#define _gloffset_VertexAttribDivisorARB 579 #define _gloffset_FlushMappedBufferRange 580 #define _gloffset_MapBufferRange 581 #define _gloffset_TexBufferARB 582 @@ -1435,7 +1433,6 @@ #define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index] #define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index] #define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index] -#define _gloffset_VertexAttribDivisor driDispatchRemapTable[VertexAttribDivisor_remap_index] #define _gloffset_LoadTransposeMatrixdARB driDispatchRemapTable[LoadTransposeMatrixdARB_remap_index] #define _gloffset_LoadTransposeMatrixfARB driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index] #define _gloffset_MultTransposeMatrixdARB driDispatchRemapTable[MultTransposeMatrixdARB_remap_index] @@ -1566,7 +1563,6 @@ #define _gloffset_FramebufferTextureARB driDispatchRemapTable[FramebufferTextureARB_remap_index] #define _gloffset_FramebufferTextureFaceARB driDispatchRemapTable[FramebufferTextureFaceARB_remap_index] #define _gloffset_ProgramParameteriARB driDispatchRemapTable[ProgramParameteriARB_remap_index] -#define _gloffset_VertexAttribDivisorARB driDispatchRemapTable[VertexAttribDivisorARB_remap_index] #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index] #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index] #define _gloffset_TexBufferARB driDispatchRemapTable[TexBufferARB_remap_index] @@ -6706,17 +6702,6 @@ SET_by_offset(disp, _gloffset_GetInteger64i_v, fn); } -typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint); -#define CALL_VertexAttribDivisor(disp, parameters) \ - (* GET_VertexAttribDivisor(disp)) parameters -static inline _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) { - return (_glptr_VertexAttribDivisor) (GET_by_offset(disp, _gloffset_VertexAttribDivisor)); -} - -static inline void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { - SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn); -} - typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixdARB)(const GLdouble *); #define CALL_LoadTransposeMatrixdARB(disp, parameters) \ (* GET_LoadTransposeMatrixdARB(disp)) parameters @@ -8147,17 +8132,6 @@ SET_by_offset(disp, _gloffset_ProgramParameteriARB, fn); } -typedef void (GLAPIENTRYP _glptr_VertexAttribDivisorARB)(GLuint, GLuint); -#define CALL_VertexAttribDivisorARB(disp, parameters) \ - (* GET_VertexAttribDivisorARB(disp)) parameters -static inline _glptr_VertexAttribDivisorARB GET_VertexAttribDivisorARB(struct _glapi_table *disp) { - return (_glptr_VertexAttribDivisorARB) (GET_by_offset(disp, _gloffset_VertexAttribDivisorARB)); -} - -static inline void SET_VertexAttribDivisorARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { - SET_by_offset(disp, _gloffset_VertexAttribDivisorARB, fn); -} - typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr); #define CALL_FlushMappedBufferRange(disp, parameters) \ (* GET_FlushMappedBufferRange(disp)) parameters Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -418,9 +418,6 @@ OPCODE_ACTIVE_PROGRAM_EXT, OPCODE_USE_SHADER_PROGRAM_EXT, - /* GL_ARB_instanced_arrays */ - OPCODE_VERTEX_ATTRIB_DIVISOR, - /* GL_NV_texture_barrier */ OPCODE_TEXTURE_BARRIER_NV, @@ -6886,24 +6883,6 @@ GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params)); -} - - -/* GL_ARB_instanced_arrays */ -static void GLAPIENTRY -save_VertexAttribDivisor(GLuint index, GLuint divisor) -{ - GET_CURRENT_CONTEXT(ctx); - Node *n; - ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = alloc_instruction(ctx, OPCODE_VERTEX_ATTRIB_DIVISOR, 2); - if (n) { - n[1].ui = index; - n[2].ui = divisor; - } - if (ctx->ExecuteFlag) { - CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor)); - } } @@ -8111,11 +8090,6 @@ params[3] = n[6].ui; CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params)); } - break; - - case OPCODE_VERTEX_ATTRIB_DIVISOR: - /* GL_ARB_instanced_arrays */ - CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui)); break; case OPCODE_TEXTURE_BARRIER_NV: @@ -9803,9 +9777,6 @@ (void) save_Uniform4uiv; #endif - /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor); - /* GL_NV_texture_barrier */ SET_TextureBarrierNV(table, save_TextureBarrierNV); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -97,7 +97,6 @@ { "GL_ARB_framebuffer_sRGB", o(EXT_framebuffer_sRGB), GL, 1998 }, { "GL_ARB_half_float_pixel", o(ARB_half_float_pixel), GL, 2003 }, { "GL_ARB_half_float_vertex", o(ARB_half_float_vertex), GL, 2008 }, - { "GL_ARB_instanced_arrays", o(ARB_instanced_arrays), GL, 2008 }, { "GL_ARB_map_buffer_range", o(ARB_map_buffer_range), GL, 2008 }, { "GL_ARB_multisample", o(dummy_true), GL, 1994 }, { "GL_ARB_multitexture", o(dummy_true), GL, 1998 }, Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -1579,7 +1579,6 @@ GLboolean Enabled; /**< Enabled flag is a boolean */ GLboolean Normalized; /**< GL_ARB_vertex_program */ GLboolean Integer; /**< Integer-valued? */ - GLuint InstanceDivisor; /**< GL_ARB_instanced_arrays */ GLuint _ElementSize; /**< size of each element in bytes */ struct gl_buffer_object *BufferObj;/**< GL_ARB_vertex_buffer_object */ @@ -1824,54 +1823,6 @@ struct prog_instruction; struct gl_program_parameter_list; struct gl_uniform_list; - -struct gl_transform_feedback_varying_info { - char *Name; - GLenum Type; - GLint Size; -}; - -struct gl_transform_feedback_output { - unsigned OutputRegister; - unsigned OutputBuffer; - unsigned NumComponents; - - /** offset (in DWORDs) of this output within the interleaved structure */ - unsigned DstOffset; - - /** - * Offset into the output register of the data to output. For example, - * if NumComponents is 2 and ComponentOffset is 1, then the data to - * offset is in the y and z components of the output register. - */ - unsigned ComponentOffset; -}; - -/** Post-link transform feedback info. */ -struct gl_transform_feedback_info { - unsigned NumOutputs; - - /** - * Number of transform feedback buffers in use by this program. - */ - unsigned NumBuffers; - - struct gl_transform_feedback_output *Outputs; - - /** Transform feedback varyings used for the linking of this shader program. - * - * Use for glGetTransformFeedbackVarying(). - */ - struct gl_transform_feedback_varying_info *Varyings; - GLint NumVarying; - - /** - * Total number of components stored in each buffer. This may be used by - * hardware back-ends to determine the correct stride when interleaving - * multiple transform feedback outputs in the same buffer. - */ - unsigned BufferStride[MAX_FEEDBACK_ATTRIBS]; -}; /** * Base class for any kind of program object @@ -2070,100 +2021,6 @@ struct gl_program_cache *Cache; }; - -/** - * ATI_fragment_shader runtime state - */ -#define ATI_FS_INPUT_PRIMARY 0 -#define ATI_FS_INPUT_SECONDARY 1 - -struct atifs_instruction; -struct atifs_setupinst; - -/** - * ATI fragment shader - */ -struct ati_fragment_shader -{ - GLuint Id; - GLint RefCount; - struct atifs_instruction *Instructions[2]; - struct atifs_setupinst *SetupInst[2]; - GLfloat Constants[8][4]; - GLbitfield LocalConstDef; /**< Indicates which constants have been set */ - GLubyte numArithInstr[2]; - GLubyte regsAssigned[2]; - GLubyte NumPasses; /**< 1 or 2 */ - GLubyte cur_pass; - GLubyte last_optype; - GLboolean interpinp1; - GLboolean isValid; - GLuint swizzlerq; -}; - -/** - * Context state for GL_ATI_fragment_shader - */ -struct gl_ati_fragment_shader_state -{ - GLboolean Enabled; - GLboolean _Enabled; /**< enabled and valid shader? */ - GLboolean Compiling; - GLfloat GlobalConstants[8][4]; - struct ati_fragment_shader *Current; -}; - - -/** - * Occlusion/timer query object. - */ -struct gl_query_object -{ - GLenum Target; /**< The query target, when active */ - GLuint Id; /**< hash table ID/name */ - GLuint64EXT Result; /**< the counter */ - GLboolean Active; /**< inside Begin/EndQuery */ - GLboolean Ready; /**< result is ready? */ -}; - - -/** - * Context state for query objects. - */ -struct gl_query_state -{ - struct _mesa_HashTable *QueryObjects; - struct gl_query_object *CurrentOcclusionObject; /* GL_ARB_occlusion_query */ - - /** GL_NV_conditional_render */ - struct gl_query_object *CondRenderQuery; - - /** GL_EXT_transform_feedback */ - struct gl_query_object *PrimitivesGenerated; - struct gl_query_object *PrimitivesWritten; - - /** GL_ARB_timer_query */ - struct gl_query_object *TimeElapsed; - - GLenum CondRenderMode; -}; - - -/** Sync object state */ -struct gl_sync_object { - struct simple_node link; - GLenum Type; /**< GL_SYNC_FENCE */ - GLuint Name; /**< Fence name */ - GLint RefCount; /**< Reference count */ - GLboolean DeletePending; /**< Object was deleted while there were still - * live references (e.g., sync not yet finished) - */ - GLenum SyncCondition; - GLbitfield Flags; /**< Flags passed to glFenceSync */ - GLuint StatusFlag:1; /**< Has the sync object been signaled? */ -}; - - /** Set by #pragma directives */ struct gl_sl_pragmas { @@ -2262,22 +2119,6 @@ */ struct string_to_uint_map *FragDataBindings; - /** - * Transform feedback varyings last specified by - * glTransformFeedbackVaryings(). - * - * For the current set of transform feeedback varyings used for transform - * feedback output, see LinkedTransformFeedback. - */ - struct { - GLenum BufferMode; - GLuint NumVarying; - GLchar **VaryingNames; /**< Array [NumVarying] of char * */ - } TransformFeedback; - - /** Post-link transform feedback info. */ - struct gl_transform_feedback_info LinkedTransformFeedback; - /** Post-link gl_FragDepth layout for ARB_conservative_depth. */ enum gl_frag_depth_layout FragDepthLayout; @@ -2410,51 +2251,6 @@ }; /** - * Transform feedback object state - */ -struct gl_transform_feedback_object -{ - GLuint Name; /**< AKA the object ID */ - GLint RefCount; - GLboolean Active; /**< Is transform feedback enabled? */ - GLboolean Paused; /**< Is transform feedback paused? */ - GLboolean EndedAnytime; /**< Has EndTransformFeedback been called - at least once? */ - - /** The feedback buffers */ - GLuint BufferNames[MAX_FEEDBACK_ATTRIBS]; - struct gl_buffer_object *Buffers[MAX_FEEDBACK_ATTRIBS]; - - /** Start of feedback data in dest buffer */ - GLintptr Offset[MAX_FEEDBACK_ATTRIBS]; - /** Max data to put into dest buffer (in bytes) */ - GLsizeiptr Size[MAX_FEEDBACK_ATTRIBS]; -}; - - -/** - * Context state for transform feedback. - */ -struct gl_transform_feedback -{ - GLenum Mode; /**< GL_POINTS, GL_LINES or GL_TRIANGLES */ - - /** The general binding point (GL_TRANSFORM_FEEDBACK_BUFFER) */ - struct gl_buffer_object *CurrentBuffer; - - /** The table of all transform feedback objects */ - struct _mesa_HashTable *Objects; - - /** The current xform-fb object (GL_TRANSFORM_FEEDBACK_BINDING) */ - struct gl_transform_feedback_object *CurrentObject; - - /** The default xform-fb object (Name==0) */ - struct gl_transform_feedback_object *DefaultObject; -}; - - - -/** * State which can be shared by multiple contexts: */ struct gl_shared_state @@ -2494,10 +2290,6 @@ struct gl_geometry_program *DefaultGeometryProgram; /*@}*/ - /* GL_ATI_fragment_shader */ - struct _mesa_HashTable *ATIShaders; - struct ati_fragment_shader *DefaultFragmentShader; - struct _mesa_HashTable *BufferObjects; /** Table of both gl_shader and gl_shader_program objects */ @@ -2506,9 +2298,6 @@ /* GL_EXT_framebuffer_object */ struct _mesa_HashTable *RenderBuffers; struct _mesa_HashTable *FrameBuffers; - - /* GL_ARB_sync */ - struct simple_node SyncObjects; void *DriverData; /**< Device driver shared state */ }; @@ -2777,11 +2566,6 @@ /** Which texture units support GL_ATI_envmap_bumpmap as targets */ GLbitfield SupportedBumpUnits; - /** - * Maximum amount of time, measured in nanseconds, that the server can wait. - */ - GLuint64 MaxServerWaitTimeout; - /** GL_EXT_provoking_vertex */ GLboolean QuadsFollowProvokingVertexConvention; @@ -2790,11 +2574,6 @@ /** OpenGL version 3.2 */ GLbitfield ProfileMask; /**< Mask of CONTEXT_x_PROFILE_BIT */ - - /** GL_EXT_transform_feedback */ - GLuint MaxTransformFeedbackSeparateAttribs; - GLuint MaxTransformFeedbackSeparateComponents; - GLuint MaxTransformFeedbackInterleavedComponents; /** GL_EXT_gpu_shader4 */ GLint MinProgramTexelOffset, MaxProgramTexelOffset; @@ -2858,17 +2637,13 @@ GLboolean ARB_geometry_shader4; GLboolean ARB_half_float_pixel; GLboolean ARB_half_float_vertex; - GLboolean ARB_instanced_arrays; GLboolean ARB_map_buffer_range; - GLboolean ARB_occlusion_query; - GLboolean ARB_occlusion_query2; GLboolean ARB_point_sprite; GLboolean ARB_seamless_cube_map; GLboolean ARB_shader_objects; GLboolean ARB_shader_stencil_export; GLboolean ARB_shader_texture_lod; GLboolean ARB_shading_language_100; - GLboolean ARB_sync; GLboolean ARB_texture_border_clamp; GLboolean ARB_texture_buffer_object; GLboolean ARB_texture_compression_rgtc; @@ -2881,7 +2656,6 @@ GLboolean ARB_texture_non_power_of_two; GLboolean ARB_texture_rg; GLboolean ARB_texture_storage; - GLboolean ARB_transform_feedback2; GLboolean ARB_transpose_matrix; GLboolean ARB_uniform_buffer_object; GLboolean ARB_vertex_array_object; @@ -2895,7 +2669,6 @@ GLboolean EXT_clip_volume_hint; GLboolean EXT_compiled_vertex_array; GLboolean EXT_depth_bounds_test; - GLboolean EXT_draw_buffers2; GLboolean EXT_draw_range_elements; GLboolean EXT_fog_coord; GLboolean EXT_framebuffer_blit; @@ -2925,8 +2698,6 @@ GLboolean EXT_texture_mirror_clamp; GLboolean EXT_texture_snorm; GLboolean EXT_texture_sRGB; - GLboolean EXT_transform_feedback; - GLboolean EXT_timer_query; GLboolean EXT_vertex_array_bgra; GLboolean OES_standard_derivatives; /* vendor extensions */ @@ -2938,7 +2709,6 @@ GLboolean ATI_texture_compression_3dc; GLboolean ATI_texture_mirror_once; GLboolean ATI_texture_env_combine3; - GLboolean ATI_fragment_shader; GLboolean ATI_separate_stencil; GLboolean IBM_rasterpos_clip; GLboolean IBM_multimode_draw_arrays; @@ -2947,7 +2717,6 @@ GLboolean MESA_ycbcr_texture; GLboolean MESA_texture_array; GLboolean NV_blend_square; - GLboolean NV_conditional_render; GLboolean NV_fog_distance; GLboolean NV_fragment_program; GLboolean NV_fragment_program_option; @@ -3037,7 +2806,6 @@ #define _NEW_PROGRAM_CONSTANTS (1 << 27) #define _NEW_BUFFER_OBJECT (1 << 28) #define _NEW_FRAG_CLAMP (1 << 29) -#define _NEW_TRANSFORM_FEEDBACK (1 << 30) /**< gl_context::TransformFeedback */ #define _NEW_ALL ~0 /** @@ -3305,14 +3073,9 @@ struct gl_vertex_program_state VertexProgram; struct gl_fragment_program_state FragmentProgram; struct gl_geometry_program_state GeometryProgram; - struct gl_ati_fragment_shader_state ATIFragmentShader; struct gl_shader_state Shader; /**< GLSL shader object state */ struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_TYPES]; - - struct gl_query_state Query; /**< occlusion, timer queries */ - - struct gl_transform_feedback TransformFeedback; struct gl_buffer_object *CopyReadBuffer; /**< GL_ARB_copy_buffer */ struct gl_buffer_object *CopyWriteBuffer; /**< GL_ARB_copy_buffer */ Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -521,11 +521,6 @@ return array->Integer; } goto error; - case GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB: - if (ctx->Extensions.ARB_instanced_arrays) { - return array->InstanceDivisor; - } - goto error; default: ; /* fall-through */ } @@ -1057,34 +1052,6 @@ } -/** - * See GL_ARB_instanced_arrays. - * Note that the instance divisor only applies to generic arrays, not - * the legacy vertex arrays. - */ -void GLAPIENTRY -_mesa_VertexAttribDivisor(GLuint index, GLuint divisor) -{ - GET_CURRENT_CONTEXT(ctx); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - - if (!ctx->Extensions.ARB_instanced_arrays) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glVertexAttribDivisor()"); - return; - } - - if (index >= ctx->Const.VertexProgram.MaxAttribs) { - _mesa_error(ctx, GL_INVALID_ENUM, "glVertexAttribDivisor(index = %u)", - index); - return; - } - - ASSERT(VERT_ATTRIB_GENERIC(index) < Elements(ctx->Array.ArrayObj->VertexAttrib)); - - ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)].InstanceDivisor = divisor; -} - - /** * Copy one client vertex array to another. @@ -1103,7 +1070,6 @@ dst->Enabled = src->Enabled; dst->Normalized = src->Normalized; dst->Integer = src->Integer; - dst->InstanceDivisor = src->InstanceDivisor; dst->_ElementSize = src->_ElementSize; _mesa_reference_buffer_object(ctx, &dst->BufferObj, src->BufferObj); dst->_MaxElement = src->_MaxElement; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -249,10 +249,6 @@ _mesa_PrimitiveRestartIndex(GLuint index); -extern void GLAPIENTRY -_mesa_VertexAttribDivisor(GLuint index, GLuint divisor); - - extern void _mesa_copy_client_array(struct gl_context *ctx, struct gl_client_array *dst, Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c [iso-8859-1] Tue Oct 1 19:43:16 2013 @@ -159,8 +159,7 @@ const GLboolean ver_3_3 = (ver_3_2 && ctx->Const.GLSLVersion >= 330 && ctx->Extensions.ARB_blend_func_extended && - ctx->Extensions.ARB_explicit_attrib_location && - ctx->Extensions.ARB_instanced_arrays); + ctx->Extensions.ARB_explicit_attrib_location); if (ver_3_3) { major = 3;

1 0

[jgardou] 60503: [MESA] - leaner build part 4 of X - Get rid of ARB_occlusion_query, ARB_occlusion_query2, ARB_sync, ARB_transform_feedback2, EXT_draw_buffers2, EXT_transform_feedback, EXT_timer_qu...
by jgardou＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: jgardou Date: Tue Oct 1 19:30:37 2013 New Revision: 60503 URL: http://svn.reactos.org/svn/reactos?rev=60503&view=rev Log: [MESA] - leaner build part 4 of X - Get rid of ARB_occlusion_query, ARB_occlusion_query2, ARB_sync, ARB_transform_feedback2, EXT_draw_buffers2, EXT_transform_feedback, EXT_timer_query, ATI_fragment_shader (this time for real) and NV_conditional_render extensions Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/atifragshader.c trunk/reactos/dll/opengl/mesa/src/mesa/main/atifragshader.h trunk/reactos/dll/opengl/mesa/src/mesa/main/condrender.c trunk/reactos/dll/opengl/mesa/src/mesa/main/condrender.h trunk/reactos/dll/opengl/mesa/src/mesa/main/queryobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/queryobj.h trunk/reactos/dll/opengl/mesa/src/mesa/main/remap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/remap.h trunk/reactos/dll/opengl/mesa/src/mesa/main/remap_helper.h trunk/reactos/dll/opengl/mesa/src/mesa/main/syncobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/syncobj.h trunk/reactos/dll/opengl/mesa/src/mesa/main/transformfeedback.c trunk/reactos/dll/opengl/mesa/src/mesa/main/transformfeedback.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_atifragshader.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_atifragshader.h Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/accum.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.h trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/get.h trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_bitmap.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_clear.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_copypix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_context.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/tnl.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_inplace.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/l… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/accum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/atifragshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/atifragshader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/condrender.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/condrender.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/get.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/queryobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/queryobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/remap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/remap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/remap_helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/syncobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/syncobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/transformfeedback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/transformfeedback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_atifragshader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_atifragshader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_clear.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_copypix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/tnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_inplace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v…

1 0

[tfaber] 60502: [NTOS:MM] - Print some debug information on assertion failures in MiDecrementReferenceCount. CORE-6690
by tfaber＠svn.reactos.org 01 Oct '13

01 Oct '13

Author: tfaber Date: Tue Oct 1 17:51:38 2013 New Revision: 60502 URL: http://svn.reactos.org/svn/reactos?rev=60502&view=rev Log: [NTOS:MM] - Print some debug information on assertion failures in MiDecrementReferenceCount. CORE-6690 Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Oct 1 17:51:38 2013 @@ -1308,9 +1308,18 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Sanity checks on the page */ - ASSERT(PageFrameIndex < MmHighestPhysicalPage); - ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); - ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + if (PageFrameIndex >= MmHighestPhysicalPage || + Pfn1 != MI_PFN_ELEMENT(PageFrameIndex) || + Pfn1->u3.e2.ReferenceCount == 0 || + Pfn1->u3.e2.ReferenceCount >= 2500) + { + DPRINT1("PageFrameIndex=0x%lx, MmHighestPhysicalPage=0x%lx\n", PageFrameIndex, MmHighestPhysicalPage); + DPRINT1("Pfn1=%p, Element=%p, RefCount=%u\n", Pfn1, MI_PFN_ELEMENT(PageFrameIndex), Pfn1->u3.e2.ReferenceCount); + ASSERT(PageFrameIndex < MmHighestPhysicalPage); + ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex)); + ASSERT(Pfn1->u3.e2.ReferenceCount != 0); + ASSERT(Pfn1->u3.e2.ReferenceCount < 2500); + } /* Dereference the page, bail out if it's still alive */ InterlockedDecrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013