summaryrefslogtreecommitdiff
path: root/src/mesa/glapi
AgeCommit message (Collapse)Author
2005-07-18Missed this on the previous commit.Ian Romanick
2005-07-18Wrap every place that accesses a dispatch table with a macro. A new script-Ian Romanick
generated file, called src/mesa/glapi/dispatch.h, is added. This file contains three macros for each API function. It contains a GET, a SET, and a CALL. Each of the macros take a pointer to the context and a pointer to the dispatch table. In several threads on mesa3d-dev we discussed replacing _glapi_add_entrypoint with a new function called _glapi_add_dispatch. For this discussion, the important difference between the two is that the caller of _glapi_add_dispatch does *not* know what the dispatch offset will be at compile time. Because of this callers need to track the dispatch offset returned by _glapi_add_dispatch. http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2 The downside is that driver code then has to access the dispatch table two different ways. It accesses it using structure tags (e.g., exec->Begin) for functions with fixed offsets and via a remap table (e.g., exec[ remap->NewExtensionFunction ]) for functions without fixed offsets. Yuck! Using the macros allows both types of functions to be accessed identically. If a driver needs to set a pointer for Begin, it does 'SET_Begin(ctx, exec, my_begin_function)'. If it needs to set a pointer for NewExtensionFunction, it does 'SET_NewExtensionFunction(ctx, exec, my_NewExtensionFunction_function)'. Furthermore, if at some point in the future a static offset is assigned for NewExtensionFunction, only the macros need to change (instead of every single place that accesses a table for that function). This code differs slightly from the originally posted patches in that the CALL, GET, and SET marcos no longer take a context pointer as a parameter. Brian Paul had suggested that the remap table could be stored as a global since it would be set at CreateScreen time and would be constant for all contexts. This change reflects that feedback. http://marc.theaimsgroup.com/?t=112087194700001&r=1&w=2
2005-07-02Add support for assembly (static) dispatch functions on x86-64. ThisIan Romanick
is basically patch #2939 from X.org bugzilla #3379. This does *not* fix the bug as it does not dynamically generate stubs at run-time. It just gets things one step closer.
2005-07-01Move the PYTHON2 and PYTHON_FLAGS assignments to configs/current, andBrian Paul
include $(TOP)/configs/current in glapi/Makefile so those vars can be easily overridden by any system config, if needed.
2005-06-30Replace add_newer_entrypoints (src/mesa/main/context.c) withIan Romanick
device-specific code. A new Python script (src/mesa/glapi/extension_helper.py) generates a list of all entry-points for all known extensions. Each driver the selects only the extensions that it needs and enables the via either driInitExtensions or driInitSingleExtension. This code has been compile-tested on a drivers, but has only been run-tested on mga and i915 (on i830 hardware). These changes were discussed at length on the mesa3d-dev mailing list. http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2
2005-06-24Ignore files generated as part of the build process.Ian Romanick
2005-06-24Fix non-x86 specific builds. The changes from glTexImage3DEXT toIan Romanick
glTexImage3D that caused me so many problems during the re-development of the API scripts reared its ugly head again. This has been fixed by tracking the parameter string for each entry-point individually. This has the annoying side-effect that the names of the parameters in all aliases of a function must be the same or gl_apitemp.py will generate bad code. :( The changes in src/mesa/glapi/{gl_API.xml,glapitable.h} and src/glx/x11/* are caused by fixing the parameter names in various function aliases that didn't match. Reported by: Eric Anholt, Jacob Jansen
2005-06-24Fixed the XCB implementation when always_array is true, thanks to Ian ↵Jeremy Kolb
Romanick for pointing it out. Please review.
2005-06-22Mark GenQueriesARB at 'always_array="true"'. This eliminates the needIan Romanick
to special-case the handling of that function in glX_proto_send.py.
2005-06-22Fixed a bug where GenQueriesARB was generating the wrong code for XCB and ↵Jeremy Kolb
wouldn't compile. Not sure how that slipped through before but it should work now.
2005-06-21Mammoth update to the Python code generator scripts that live inIan Romanick
src/mesa/glapi. Basically, the scripts that did simple things (like gl_offsets.py) were simple, and the scripts that did more complicated things (like glX_proto_send.py) were getting progressively more and more out of control. So, I re-write the foundation classes on which everything is based. One problem with the existing code is that the division between the GL API database representation and the way the output code is generated was either blury or nonexistant. The new code somewhat follows the Model-View-Controller pattern, minus the Controller. There is a distinct set of classes that model the API data, and there is a distinct set of classes that generate code from that data. One big change is in the class that represents GL functions (was glFunction, is now gl_function). There used to be an instance of this calls for each function and for each alias to that function. For example, there was an instance for PointParameterivSGIS, PointParameterivEXT, PointParameterivARB, and PointParameteriv. In the new code, there is one instance. Each instance has a list of entrypoint names for the function. In the next revision, this will allow a couple useful things. The script will be able to verify that the parameters, return type, and GLX protocol for a function and all it's aliases match. It will also allow aliases to be represented in the XML more compactly. Instead of repeating all the information, an alias can be listed as: <function name="PointParameterivARB" alias="PointParameterivEXT"/> Because the data representation was changed, the order that the alias functions are processed by the scripts also changed. This accounts for at least 2,700 of the ~3,600 lines of diffs in the generated code. Most of the remaining ~900 lines of diffs are the result of bugs *fixed* by the new scripts. The old scripts also generated code with some bugs in it. These bugs were discovered while the new code was being written. These changes were discussed on the mesa3d-dev mailing list back at the end of May: http://marc.theaimsgroup.com/?t=111714569000004&r=1&w=2 Xorg bug: 3197, 3208
2005-06-20ran "make" after update to glX_proto_send.py.Jeremy Kolb
2005-06-20Fixed some issues where XCB replies were being freed and data was not being ↵Jeremy Kolb
copied.
2005-05-26Fix gl_enums.py so that enums that are listed with the same name inIan Romanick
multiple places don't get generated multiple times.
2005-05-26Minor correction to EXT_framebuffer_object XML. Fix gl_table.py so that itIan Romanick
generates the correct script name in the generated output.
2005-05-26Make a couple minor corrections to gl_API.xml. Fixes the name of anIan Romanick
extension that was missing the GL_ part and uses the core GL type names for vertex buffer object functions instead of the ARB names. Also commits the resulting changes to the generated code. Some how, the #if sequence disappeared in the 1.52 version of glapi_x86.S.
2005-05-25Fix a couple typeos in enum names.Ian Romanick
2005-05-24moved to windows build dirKarl Schultz
2005-05-16another GLX / XCB patch (Jeremy Kolb)Brian Paul
2005-05-07Patches for XCB (Jeremy Kolb)Brian Paul
2005-04-28Stop gcc-4.0 complaining about "type qualifiers ignored on functionKeith Whitwell
return type".
2005-04-28Stop gcc-4.0 complaining about "type qualifiers ignored on functionKeith Whitwell
return type".
2005-04-18If the file name passed to parse_GL_API is None or "-", read from standardIan Romanick
input. This allows use of GL API scripts in pipelines.
2005-04-18Refactor a bunch of common code from the "leaf" scripts to a new functions,Ian Romanick
parse_GL_API, in gl_XML.py.
2005-04-18Fill-in function offsets and correct a couple typos.Ian Romanick
2005-04-18Convert all Python scripts to use XML namespaces.Ian Romanick
2005-04-18Move the DTD to its own file.Ian Romanick
2005-04-15Reverted the last change back to fix bug 3035Ben Crossman
2005-04-14Convert 'variable_param' from a CDATA attribute to a NMTOKENS attribute.Ian Romanick
The main difference is that white-space is used to separate the names instead of comas.
2005-04-14Refactor the handling of the '(true | false)' enumerated attributes.Ian Romanick
2005-04-14Modify the DTD to use NMTOKEN, enumerants, and explicit default valuesIan Romanick
wherever possible. Correct a couple mis-uses of the 'counter' attribute when 'count' was intended. Fix some errors in the DTD and in the data with 'doubles_in_order'.
2005-04-14In GLX_USE_TLS builds, make GET_CURRENT_CONTEXT use the TLS verion of theIan Romanick
variable. Without this, GET_CURRENT_CONTEXT would *always* result in a call to _glapi_get_context (because _glapi_Context is a const pointer to NULL in TLS builds).
2005-04-14A few getenv() that werent using the mesa wrapper versionBen Crossman
2005-04-13Add TLS support to libGL and, by virtue of using glthread.h and GL_CALL, allIan Romanick
DRI drivers. A TLS enabled libGL can load a TLS or a non-TLS DRI driver, but a TLS DRI driver requires a TLS enabled libGL. This fixes bug #1822.
2005-03-17xmllint fixes. Revert 'note_unflushed' changes that were accidetnallyIan Romanick
committed in the last version.
2005-03-17Enable the generation of server-side __glGetBooleanv_size and relatedIan Romanick
functions. There are two parts to this. First, a size element with a name "Get" is shorthand for having four separate size elements with names "GetIntegerv", "GetDoublev", "GetFloatv", and "GetBooleanv". Additionally, a count of "?" is treated specially. This causes a call to a handcoded function named "__gl<base name>_variable_size". This is *only* needed to support GL_COMPRESSED_TEXTURE_FORMATS. That enum can return a variable number of values depending how many compressed texture formats are supported by the implementation. Fix a problem with glGetProgram{Local,Env}Parameter[df]vARB, glAreProgramsResidentNV, and glGetVertexAttribivNV. These changes only affect code generated for the server-side. The changes to enum.c are caused by enums added for the server-side __glGetBooleanv_size functions.
2005-03-17Minor refactoring and code tweaking. The only notable chage is thatIan Romanick
FilterGLAPISpecBase::xref is replaced by FilterGLAPISpecBase::functions_by_name. The notable difference between the two is that ::functions_by_name includes all functions, whether they have an assigned offset or not. This feature will be useful (necessary) when more server-side code is generated.
2005-03-17Refactored some of the code for PrintGlxReqSize_[ch]. This ensures that theIan Romanick
same set of functions will be iterated for both the generated C-source file and the generated header file.
2005-03-17Fix the handling of zero-sized output parameters (i.e., those with typeIan Romanick
'GLvoid *'). This fixes the GLX protocol for glGetProgramStringARB. This fixes bugzilla #2747. Remove the 'ignore="true"' from glVertexAttrib4bvARB. This fixes bugzilla #2746.
2005-03-11Add support for ARB_draw_buffers and ARB_occlusion_query. The GLX protocolIan Romanick
for these extensions (as well as ARB_vertex_program and ARB_matrix_palette) was just approved by the ARB on 8-Mar-2005. Now the only extension missing for 1.5 support is ARB_vertex_buffer_object. The opcodes for ARB_matrix_palette were also added to gl_API.xml. Since this extension isn't supported by Mesa, no code is generated for it. Some tabs were also converted to spaces in the comment for GetCompressedTexImageARB.
2005-03-06Actually *use* the count_scale value associated with a parameter.Ian Romanick
2005-03-03Fix some errors in the parameter descriptions in serveral vertex / fragmentIan Romanick
program related functions.
2005-03-03Check for some common function parameter description errors in theIan Romanick
endElement handler for <function>. This catches the errors as early as possible and makes debugging other code easier.
2005-02-26Fairly significant changes to enums.c and the way it is generated. enums.cIan Romanick
now contains 3 static tables. The first table is a single, large string of all the enum names. The second table is an array, sorted by enum name, of indexes to the string table and the matching enum value. The extra string table is used to eliminate relocs (and save space) in the compiled file. The third table is an array, sorted by enum value, of indexes into the second table. The [name, enum] table contains all of the enums, but the table sorted by enum-value does not. This table contains one entry per enum value. For enum values that have multiple names (e.g., 0x84C0 has GL_TEXTURE0_ARB and GL_TEXTURE0), only an index to the "best" name will appear in the table. gl_enums.py gives precedence to "core" GL versions of names, followed by ARB versions, followed by EXT versions, followed, finally, by vendor versions (i.e., anything that doesn't fall into one of the previous categories). By filtering the unneeded elements from this table, not only can we guarantee determinism in the generated tables, but we save 364 elements in the table. The optimizations outlined above reduced the size of the stripped enums.o (on x86) from ~80KB to ~53KB. The internal organization of gl_enums.py was also heavily modified. Previously enums were stored in an unsorted list as [value, name] tuples (basically). This list was then sorted, using a user-specified compare function (i.e., VERY slow in most Python implementations) to generate a table sorted by enum value. It was then sorted again, using another user-specified compare function, to generate a table sorted by name. Enums are now stored in a dictionary, called enum_table, with the enum value as the key. Each dictionary element is a list of [name, priority] pairs. The priority is determined as described above. The table sorted by enum value is generated by sorting the keys of enum_table (i.e., very fast). The tables sorted by name are generated by creating a list, called name_table, of [name, enum value] pairs. This table can then be sorted by doing name_table.sort() (i.e., very fast). The result is a fair amount more Python code, but execution time was reduced from ~14 seconds to ~2 seconds.
2005-02-25Add GLX protocol support for ARB_fragement_program,Ian Romanick
ARB_fragment_program_shadow, ARB_vertex_program, NV_fragment_program, NV_fragment_program_option, NV_fragment_program2, NV_vertex_program, NV_vertex_program1_1, NV_vertex_program2, NV_vertex_program2_option, NV_vertex_program3, and ATI_text_fragment_shader.
2005-02-25Convert the static functions read_pixel_reply, read_reply,Ian Romanick
setup_single_request, and setup_vendor_request to the global functions __glXReadPixelReply, __glXReadReply, __glXSetupSingleRequest, and __glXSetupVendorRequest. This will make it easier to add handcoded Single / VendorPrivate / VendorPrivteWithReply functions.
2005-02-23Sort the enums in the Python code, instead of at runtime. (Zack Rusin)Brian Paul
2005-02-23Corrected the value for X_GLrop_SecondaryColor3svEXT.Ian Romanick
2005-02-22generate enums.c file (Zack Rusin)Brian Paul
2005-02-09Generate GLX protocol for pixel single commands.Ian Romanick