aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi/gl_XML.py
Commit message (Collapse)AuthorAgeFilesLines
* glapi: mv code generation to subdirGeorge Sapountzis2010-02-241-967/+0
| | | | This just moves files, code generation Makefile will be fixed in next commit for easier review.
* Merge remote branch 'origin/opengl-es-v2'Chia-I Wu2010-01-201-0/+3
|\
| * glapi: Add is_abi() to test if a function is in the ABI.Chia-I Wu2009-11-051-0/+3
| | | | | | | | | | | | | | The test is done by checking if the offset is manually assigned. The generated headers are unchanged. Signed-off-by: Chia-I Wu <[email protected]>
* | Sun compilers now support some gcc __attribute__ valuesAlan Coopersmith2010-01-191-3/+3
|/ | | | | | | | | | | Sun cc 5.9 and later (__SUNPRO_C >= 0x590) support __attribute__ calls for aligned, always_inline, noinline, pure, const, and malloc. This commit includes updates to files that were regenerated by gl_XML.py after adding the __SUNPRO_C checks to it Signed-off-by: Alan Coopersmith <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* GLX: Fix protocol for glTexSubImage#DIan Romanick2008-12-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The TexSubImage commands do not have the "NULL image" flag that was introduced with glTexImage3D. However, there is a CARD32 pad element where that flag would be. Removing the img_null_flag causes the flag to be removed from the protocol. This changes the protocol and breaks everything. In order to prevent needing to hand-code all of the TexSubImage functions, a new attribute was added to the param element. This new attribute, called "padding," is a boolean flag that selects whether or not the parameter is a real parameter (default / false) or is protocol padding (true) that does not appear in the function's parameter list. This change resulted in a number of changes to other Python scripts. In almost all cases parameters with the is_padding flag set should not be emitted. This patch only changes the the XML, the DTD, and the generator scripts. It does NOT include the resulting changes to the generated code. Generated code in the X server is also changed by the script / XML changes in this patch. Signed-off-by: Ian Romanick <[email protected]>
* GLX protocol fixes for glMap* functions (bug 8899)Brian Paul2006-11-221-2/+3
|
* Fix bug #4681.Ian Romanick2006-10-111-0/+11
| | | | | | | | | | | | | | | | | glDeleteTextures and glDeleteTexturesEXT were erroneously listed as aliases of each other. For anything /except/ GLX protocol they are aliases. This set of changes allows functions that are functionally identical but have different GLX protocol to be listed as aliases. When building with GLX_INDIRECT_RENDERING set, different static functions are used. These functions determine whether the current context is direct rendering or not. If the context is direct rendering, the aliased function (e.g., glDeleteTextures in the case of glDeleteTexturesEXT) is called. If the context is not direct rendering, the correct GLX protocol is sent. For a deeper explanation of what is changed, please see: http://dri.freedesktop.org/wiki/PartiallyAliasedFunctions
* Divide categories into four groups as they are processed from the XML. AddIan Romanick2006-10-041-51/+100
| | | | | | | | | | | | | an iterator to iterate over the categories in order, starting with "core" versions, then ARB extensions, then numbered non-ARB extensions, and finally unnumbered extensions. Use the new iterator in a couple places to ensure that output that is grouped by catgory is generated in a consistent order. More changes to the scripts are coming. The generated files will be committed one time after all the changes are in. Too bad we're not using GIT, or this would be easy. :(
* Add two new gl_function methods. dispatch_name returns the name ofIan Romanick2006-08-281-0/+12
| | | | | | | | | | | | | the true static dispatch name (either the glFooBar name or the gl_dispatch_stub_XXX name). static_name returns the name of the static function for a specific alias of a GL function. Adding (and using) these two functions corrects some problems in the generated code related to functions with multiple aliases where some of the aliases have true static dispatch functions and some don't. I have verified that everything under progs, except xdemos/xdemo, correctly link. I did this by doing 'make linux-dri-x86-64 PROGRAM_DIRS="demos redbook samples xdemos tests"'.
* Explicitly store the names for each function that should have a staticIan Romanick2006-08-261-1/+7
| | | | | | entry point generated. This allows us to do things like generate a static entry point for glPointParameterfvARB but not for glPointParameterfvSGIS.
* Add a new offset mode to the GL API XML. This mode, called "assign,"Ian Romanick2006-08-241-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tells the scripts to assign an available offset to the function. The important changes are in src/mesa/glapi/gl_XML.py and src/mesa/glapi/*.xml. Since the DRI drivers only depend on functions required by the ABI (e.g., GL 1.2 + ARB_multitexture) having fixed offsets, all functions not in the ABI use "assign" mode. This has caused the offset of basically every function outside the ABI to change. I have verified that a libGL with this patch works with a DRI driver without the patch. Futher, several function were removed from the dispatch tables altogether. These are the functions for the following extensions: GL_SGIS_texture_filter4 GL_SGIS_texture4D GL_SGIS_detail_texture GL_SGIS_sharpen_texture GL_SGIX_sprite GL_SGIX_instruments GL_SGIX_framezoom GL_SGIX_tag_sample_buffer GL_SGIX_reference_plane GL_SGIX_flush_raster GL_SGIX_list_priority GL_SGIX_fragment_lighting GL_PGI_misc_hints GL_EXT_index_material GL_EXT_index_func GL_3DFX_tbuffer This removes 50 functions from the dispatch table.
* Add new attribute called static_dispatch to the <function> element. ThisIan Romanick2006-08-221-0/+2
| | | | | | | | | | | | | | | | | | | boolean attribute, which defaults to true, determines whether or not a static dispatch function is available in libGL for applications to link against. Ideally, any new functions that are not part of the ABI should not have directly accessable dispatch functions. This forces applications to use glXGetProcAddress to access these functions. By doing this we can gracefully remove functions from libGL without breaking the linkage of applications. Note that the static dispatch functions are still generated. However, they are given names like gl_dispatch_stub_820 and are marked with the "hidden" linker attribute. All extension functions added since the previous Mesa release (6.5) have been marked as 'static_dispatch="false"'.
* restore FASTCALL stuffBrian Paul2005-10-201-3/+5
|
* Disable the FASTCALL optimization because it still breaks server-side GLX.Brian Paul2005-10-201-5/+3
|
* /dri/msgAdam Jackson2005-08-261-1/+1
|
* Fix the scripts for the cygwin & mingw changesAlan Hourihane2005-08-261-2/+2
|
* Remove the logic that determines at compile time whether or not HAVE_ALIASIan Romanick2005-08-111-17/+0
| | | | | | | | should be defined. It was flawed on some platforms (e.g., Darwin & mingw). Instead, rely on the build system to define it on the compiler command line. This also reverts ajax's hand-edit to indirect_size.c. I'll fix that on the X.org side of things later today.
* Add support for assembly (static) dispatch functions on x86-64. ThisIan Romanick2005-07-021-4/+7
| | | | | | 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.
* Fix non-x86 specific builds. The changes from glTexImage3DEXT toIan Romanick2005-06-241-59/+67
| | | | | | | | | | | | | | | 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
* Mammoth update to the Python code generator scripts that live inIan Romanick2005-06-211-550/+608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* If the file name passed to parse_GL_API is None or "-", read from standardIan Romanick2005-04-181-1/+7
| | | | input. This allows use of GL API scripts in pipelines.
* Refactor a bunch of common code from the "leaf" scripts to a new functions,Ian Romanick2005-04-181-0/+18
| | | | parse_GL_API, in gl_XML.py.
* Convert all Python scripts to use XML namespaces.Ian Romanick2005-04-181-61/+70
|
* Convert 'variable_param' from a CDATA attribute to a NMTOKENS attribute.Ian Romanick2005-04-141-1/+1
| | | | | The main difference is that white-space is used to separate the names instead of comas.
* Refactor the handling of the '(true | false)' enumerated attributes.Ian Romanick2005-04-141-29/+22
|
* Enable the generation of server-side __glGetBooleanv_size and relatedIan Romanick2005-03-171-3/+4
| | | | | | | | | | | | | | | | | | 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.
* Minor refactoring and code tweaking. The only notable chage is thatIan Romanick2005-03-171-9/+6
| | | | | | | | 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.
* Actually *use* the count_scale value associated with a parameter.Ian Romanick2005-03-061-3/+11
|
* Check for some common function parameter description errors in theIan Romanick2005-03-031-0/+34
| | | | | endElement handler for <function>. This catches the errors as early as possible and makes debugging other code easier.
* Fairly significant changes to enums.c and the way it is generated. enums.cIan Romanick2005-02-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* generate enums.c file (Zack Rusin)Brian Paul2005-02-221-0/+3
|
* Add the ability to include other XML files by using aIan Romanick2005-02-081-0/+10
| | | | <include name="file"/> element as a sub-element of <OpenGLAPI>.
* Small refactor. Add glXFunctionIterator, which derrives fromIan Romanick2005-02-021-18/+11
| | | | | | | | | | | | | glFunctionIterator and is used by GlxProto. The difference between the two iterator classes is that glXFunctionIterator skips functions that the GLX protocol code does not care about. Replace all the remaining occurances of glParameter::p_count_parameters and glFunction::count_parameters with the count_parameter_list. Add GlxProto::size_call to generate the C code to calculate 'compsize'. These trivially modify the generated code.
* Small refactor. Move several utility functions from glX_XML.py toIan Romanick2005-02-011-2/+45
| | | | | | | | | FilterGLAPISpecBase (in gl_XML.py). When these functions are used to emit common #define lines, the will automatically be undefined in FilterGLAPISpecBase::printFooter if header_tag is set (i.e., the file is a header file). These changes do not modify the generated code.
* Add GlxProto::createEnumFunction and add a 'context' parameter to theIan Romanick2005-02-011-0/+14
| | | | | | | | | | | | | | | | | | | glXEnumFunction constructor. The allows sub-classes of GlxProto to over-ride the concrete class used for glXEnumFunction. In addition to tracking p_count_parameters in glParameter, break the comma separated list of parameter names into a Python list called count_parameter_list. It is now possible to query if a name is the name of one of the count parameters just by comparing param.count_parameter_list.count(n) to zero. Eventually the remaining uses of p_count_parameters will be replaced with uses of count_parameter_list. Make sure that 'void *' parameters are handled correctly in glParameter::size_string. Add PrintGlxReqSize_h and PrintGlxReqSize_c. These classes emit prototypes and functions used on the server-side to determine the expected size of an incoming GL command.
* Refactor the code to emit multiple-inclusion protection toIan Romanick2005-01-281-0/+8
| | | | | | | | | FilterGLAPISpecBase. Since the size_h mode of glX_proto_size.py will be used to generate multiple header files, add an option to specify the define that is used for multiple-inclusion protection. The changes to the header files in this commit are just a side-effect of the changes to the Python scripts.
* Add a glFunctionIterator class to iterate over the functions stored in aIan Romanick2005-01-251-18/+58
| | | | | | higher-level API object. Use this type of object to implement the printFunctions method. Modify other functions that iterate over the list of functions to use this type of object.
* Add a "count" attribute to "enums" elements to set the default countIan Romanick2005-01-251-5/+28
| | | | | | | | | | | | used for "size" sub-elements. In the future the "count" attribute may be removed completely from "size" sub-elements, so gl_API.xml was also updated. Support was added for a (currently unused) "mode" attribute for "size" elements. Basically, functions are marked as either "get" or "set". This will be used in generating size functions for the server-side (where the "get" functions have to know how much data to return). It could also be used to help generate code for src/mesa/main/get.c.
* Remove glEnum::startElement, but refactor out some of the common code fromIan Romanick2005-01-241-7/+10
| | | | there and glXEnum::startElement to glEnum::process_attributes.
* Track the GLX protocol names for GL types.Ian Romanick2005-01-071-0/+1
|
* Pixel oriented render functions are now generated by theIan Romanick2005-01-071-4/+48
| | | | | | glX_proto_send.py script. This eliminates ~600 lines of non-generated code. With proper compiler optimization settings, it also decreases the size of libGL.so by about 3KB.
* Added some comments and fixed typeos. Slightly refactored the wayIan Romanick2004-12-211-5/+8
| | | | | function parameters are iterated. There are no changes in the generated code.
* Added the ability to get the size of a parameter as a string. Changed theIan Romanick2004-12-011-4/+25
| | | | | | meaning of "variable length array" to include variables that are "counted" instead of just ones that use an enum to map to a count. Added glParameter to the glItemFactory.
* minor clean-ups, found with pycheckerBrian Paul2004-10-281-2/+1
|
* Added some in-code documentation. Modifed glParameter to be aIan Romanick2004-05-191-37/+124
| | | | subclass of glItem.
* New scripts for processing the XML version of APIspec. Mail is beingIan Romanick2004-05-181-0/+406
sent to mesa3d-dev with a more detailed description.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 08:33:47 +0000