Age | Commit message (Collapse) | Author |
|
endElement handler for <function>. This catches the errors as early as
possible and makes debugging other code easier.
|
|
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.
|
|
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.
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
when ready.
|
|
<include name="file"/> element as a sub-element of <OpenGLAPI>.
|
|
files that have been trivially changed by other recent commits.
|
|
|
|
in the gl_API.xml database. Add "official" support for SGI_color_matrix
and SGI_texture_color_table. These were previously supported only by
way of ARB_imaging.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
client-side code doesn't try to calculate the size of the output
parameters. The server will tell the client how big it is.
|
|
parameters to GetColorTableParameter[if]v. FORMAT, WIDTH, and the SIZE
enums cannot be parameters to ColorTableParameter[if]v.
|
|
The attribute can now take one of 4 states. "false" (the default value)
means that no handcoding is required for the function. "client" means that
the function must be handcoded on the client-side only. "server" means that
the function must be handcoded on the server-side only. "true" menas that
the function must be handcoded on both the client-side and the server-side.
Version 1.14 of glX_proto_send.py accidentally contained a line of this
change.
|
|
The debug version of indirect.c has proven very helpful during the
development of new client-side and server-side GLX protocol code. This is
put here instead of in the DISPATCH and DISPATCH_RETURN macros in dispatch.c
for two reasons.
1. I only want the debug information when indirect-rendering is used.
2. Functions that require a reply from the server, some of which do not have
a return value (e.g., glFlush, glFinish, glGetLightfv, etc.), do not need
the extra glFinish call.
|
|
|
|
server-side GLX implementation.
Correct the protocol for EXT_convolution. Several functions were
incorrectly listed as 'sop' that should have been 'vendorpriv'.
Remove TexParameter[if]v from the list of functions associated with
TEXTURE_RESIDENT. The state associated with this enum is read-only.
Sort the enums by value for each particular size. This ensures that the
signature is the same no matter what the ordering is of the enums in the XML
file. The side effect is that there are some extra changes in
indirect_size.c.
|
|
Parameters to glX_proto_size.py are now used to determine whether to emit
either get-type function, set-type functions, or both. When only get-type
functions are emitted, they can optionally alias set-type functions. This
would be useful if, for example, the two types were in different source
files.
The real work to implement this is in SizeStubFunctionIterator class. All
of the logic for which functions to iterate and in which order is
implemented there.
|
|
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.
|
|
|
|
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.
|
|
|
|
source file.
|
|
|
|
there and glXEnum::startElement to glEnum::process_attributes.
|
|
actually used both values, it was refactored into command_fixed_length and
command_variable_length. glXFunction::offset_of_first_parameter was also
added.
|
|
section are marked as ignored. Also ignore any functions that don't have
assigned dispatch offsets.
Fold Adam Jackson's changes to indirect_size.c into the generator scripts so
that they don't get lost. "DO NOT EDIT" really means "DO NOT EDIT". ;)
|
|
|
|
'-DHAVE_ALIAS' to DEFINES in the config file used for building. On the
linux-dri-x86 build, this cuts 4KB from libGL.so. HAVE_ALIAS is not
currently enabled in any of the configs.
|
|
an extension spec). It's not perfect, and it doesn't support certain
functions that other scripts here can (e.g., pixel functions). However,
it is a good start and has already proven useful to me.
|
|
|
|
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.
|
|
multiple of 4 correctly in some cases.
|
|
mistakenly emitted in the wrong order.
|
|
for determining when extra data needed to be read after a reply (to ensure
4-byte alignment) and the logic to determine whether or not to read reply
data after the SingleReply packet were both slightly wrong.
|
|
generated for commands that can use RenderLarge packets. Tweak the code for
__glXFlushRenderBuffer slightly.
|
|
function parameters are iterated. There are no changes in the generated
code.
|
|
|
|
|
|
no error detection, slow, may not be 100% correct but a good start
|
|
|
|
missing enum information for GL_EXT_cull_vertex and
GL_SGIS_texture_color_mask. Added GL_SUN_mesh_array. Corrected the
spelling of the "length" parameter to GetActiveUniformARB.
|