diff options
430 files changed, 1331 insertions, 1284 deletions
diff --git a/libX11/man/XGetXCBConnection.man b/libX11/man/XGetXCBConnection.man index 3b4ad11f7..7488b6ee7 100644 --- a/libX11/man/XGetXCBConnection.man +++ b/libX11/man/XGetXCBConnection.man @@ -30,7 +30,6 @@ xcb_connection_t *XGetXCBConnection(Display *\fIdpy\fP); .SH ARGUMENTS .IP \fIdpy\fP 1i Specifies the connection to the X server. -.IN "Environment" "DISPLAY" .SH DESCRIPTION The \fIXGetXCBConnection\fP function returns the XCB connection associated with an Xlib Display. Clients can use this XCB connection with functions from the diff --git a/libX11/man/XSetEventQueueOwner.man b/libX11/man/XSetEventQueueOwner.man index d9740d4c6..f49ac7149 100644 --- a/libX11/man/XSetEventQueueOwner.man +++ b/libX11/man/XSetEventQueueOwner.man @@ -42,7 +42,6 @@ call the XCB event-handling functions. XCB owns the event queue. Use the XCB event-handling functions. Do not call the Xlib event-handling functions. .RE -.IN "Environment" "DISPLAY" .SH DESCRIPTION While a client using Xlib/XCB can issue requests and handle their replies or errors with either Xlib or XCB, only one can own and handle the event queue. diff --git a/libX11/specs/libX11/CH02.xml b/libX11/specs/libX11/CH02.xml index 12df68ee4..656dce8b1 100644 --- a/libX11/specs/libX11/CH02.xml +++ b/libX11/specs/libX11/CH02.xml @@ -608,7 +608,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the appropriate screen number on the host server. -<!-- .ds Cn depths --> </para> </listitem> </varlistentry> @@ -618,7 +617,7 @@ Specifies the appropriate screen number on the host server. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of depths. </para> </listitem> </varlistentry> @@ -1511,12 +1510,9 @@ To obtain the pixmap format information for a given display, use <indexterm significance="preferred"><primary>XListPixmapFormats</primary></indexterm> <!-- .sM --> </para> -<para> -ImageByteOrder(<emphasis remap='I'>display</emphasis>) -</para> -<funcsynopsis id='XImageByteOrder'> +<funcsynopsis id='XListPixmapFormats'> <funcprototype> - <funcdef>int <function>XImageByteOrder</function></funcdef> + <funcdef>XPixmapFormatValues *<function>XListPixmapFormats</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> <paramdef>int<parameter> *count_return</parameter></paramdef> </funcprototype> @@ -1530,7 +1526,6 @@ ImageByteOrder(<emphasis remap='I'>display</emphasis>) <listitem> <para> Specifies the connection to the X server. -<!-- .ds Cn pixmap formats that are supported by the display --> </para> </listitem> </varlistentry> @@ -1540,7 +1535,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of pixmap formats that are supported by the display. </para> </listitem> </varlistentry> @@ -1577,7 +1572,7 @@ These are often used by toolkits as well as by simple applications. <para> ImageByteOrder(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='XImageByteOrder'> <funcprototype> <funcdef>int <function>XImageByteOrder</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3466,7 +3461,6 @@ Specifies the connection to the X server. <listitem> <para> Returns the file descriptors. -<!-- .ds Cn file descriptors --> </para> </listitem> </varlistentry> @@ -3476,7 +3470,7 @@ Returns the file descriptors. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of file descriptors. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH03.xml b/libX11/specs/libX11/CH03.xml index 7d2b20e52..4e599da3b 100644 --- a/libX11/specs/libX11/CH03.xml +++ b/libX11/specs/libX11/CH03.xml @@ -1285,8 +1285,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the parent window. -<!-- .ds Xy , which are the top-left outside corner of the created window's \ --> -borders and are relative to the inside of the parent window's borders </para> </listitem> </varlistentry> @@ -1307,9 +1305,9 @@ borders and are relative to the inside of the parent window's borders </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the created window's inside dimensions \ --> -and do not include the created window's borders +Specify the x and y coordinates, which are the top-left outside corner of +the created window's borders and are relative to the inside of the parent +window's borders. </para> </listitem> </varlistentry> @@ -1330,7 +1328,8 @@ and do not include the created window's borders </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the created window's inside +dimensions and do not include the created window's borders. The dimensions must be nonzero, or a <errorname>BadValue</errorname> @@ -1547,8 +1546,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the parent window. -<!-- .ds Xy , which are the top-left outside corner of the new window's borders \ --> -and are relative to the inside of the parent window's borders </para> </listitem> </varlistentry> @@ -1569,9 +1566,9 @@ and are relative to the inside of the parent window's borders </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the created window's inside dimensions \ --> -and do not include the created window's borders +Specify the x and y coordinates, which are the top-left outside corner of +the new window's borders and are relative to the inside of the parent +window's borders. </para> </listitem> </varlistentry> @@ -1592,7 +1589,8 @@ and do not include the created window's borders </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the created window's inside +dimensions and do not include the created window's borders. The dimensions must be nonzero, or a <errorname>BadValue</errorname> @@ -2550,7 +2548,6 @@ To configure a window's size, location, stacking, or border, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi to be reconfigured --> </para> </listitem> </varlistentry> @@ -2560,7 +2557,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window to be reconfigured. </para> </listitem> </varlistentry> @@ -2655,7 +2652,6 @@ To move a window without changing its size, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi to be moved --> </para> </listitem> </varlistentry> @@ -2665,9 +2661,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. -<!-- .ds Xy , which define the new location of the top-left pixel \ --> -of the window's border or the window itself if it has no border +Specifies the window to be moved. </para> </listitem> </varlistentry> @@ -2688,7 +2682,9 @@ of the window's border or the window itself if it has no border </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which define the new location of the +top-left pixel of the window's border or the window itself if it has no +border. </para> </listitem> </varlistentry> @@ -2767,8 +2763,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the window. -<!-- .ds Wh , which are the interior dimensions of the window \ --> -after the call completes </para> </listitem> </varlistentry> @@ -2789,7 +2783,8 @@ after the call completes </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the interior dimensions of the +window after the call completes. </para> </listitem> </varlistentry> @@ -2861,7 +2856,6 @@ To change the size and location of a window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi to be reconfigured --> </para> </listitem> </varlistentry> @@ -2871,8 +2865,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. -<!-- .ds Xy , which define the new position of the window relative to its parent --> +Specifies the window to be reconfigured. </para> </listitem> </varlistentry> @@ -2893,8 +2886,8 @@ Specifies the window (Wi. </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which define the interior size of the window --> +Specify the x and y coordinates, which define the new position of the +window relative to its parent. </para> </listitem> </varlistentry> @@ -2915,7 +2908,7 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which define the interior size of the window. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH04.xml b/libX11/specs/libX11/CH04.xml index 388a6801c..b8e73a469 100644 --- a/libX11/specs/libX11/CH04.xml +++ b/libX11/specs/libX11/CH04.xml @@ -61,8 +61,6 @@ a given window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose list of children, root, parent, and number of children \ --> -you want to obtain </para> </listitem> </varlistentry> @@ -72,7 +70,8 @@ you want to obtain </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose list of children, root, parent, and number of +children you want to obtain. </para> </listitem> </varlistentry> @@ -165,7 +164,6 @@ To obtain the current attributes of a given window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose current attributes you want to obtain --> </para> </listitem> </varlistentry> @@ -175,7 +173,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose current attributes you want to obtain. </para> </listitem> </varlistentry> @@ -394,7 +392,6 @@ To obtain the current geometry of a given drawable, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Dr , which can be a window or a pixmap --> </para> </listitem> </varlistentry> @@ -404,7 +401,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the drawable(Dr. +Specifies the drawable, which can be a window or a pixmap. </para> </listitem> </varlistentry> @@ -698,7 +695,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the window. -<!-- .ds Ro that the pointer is in --> </para> </listitem> </varlistentry> @@ -708,7 +704,7 @@ Specifies the window. </term> <listitem> <para> -Returns the root window (Ro. +Returns the root window that the pointer is in. </para> </listitem> </varlistentry> @@ -1162,7 +1158,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the array of atom names. -<!-- .ds Cn atom names in the array --> </para> </listitem> </varlistentry> @@ -1172,7 +1167,7 @@ Specifies the array of atom names. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of atom names in the array. </para> </listitem> </varlistentry> @@ -1321,7 +1316,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the array of atoms. -<!-- .ds Cn atoms in the array --> </para> </listitem> </varlistentry> @@ -1331,7 +1325,7 @@ Specifies the array of atoms. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of atoms in the array. </para> </listitem> </varlistentry> @@ -1436,7 +1430,6 @@ To obtain the type, format, and value of a property of a given window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose property you want to obtain --> </para> </listitem> </varlistentry> @@ -1446,7 +1439,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose property you want to obtain. </para> </listitem> </varlistentry> @@ -1707,7 +1700,6 @@ To obtain a given window's property list, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose property list you want to obtain --> </para> </listitem> </varlistentry> @@ -1717,7 +1709,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose property list you want to obtain. </para> </listitem> </varlistentry> @@ -1784,7 +1776,6 @@ To change a property of a given window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose property you want to change --> </para> </listitem> </varlistentry> @@ -1794,7 +1785,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose property you want to change. </para> </listitem> </varlistentry> @@ -2093,7 +2084,6 @@ To delete a property on a given window, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose property you want to delete --> </para> </listitem> </varlistentry> @@ -2103,7 +2093,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose property you want to delete. </para> </listitem> </varlistentry> @@ -2338,7 +2328,6 @@ To return the selection owner, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Se whose owner you want returned --> </para> </listitem> </varlistentry> @@ -2348,7 +2337,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the selection atom (Se. +Specifies the selection atom whose owner you want returned. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH05.xml b/libX11/specs/libX11/CH05.xml index 501ead0d9..c37eaddb8 100644 --- a/libX11/specs/libX11/CH05.xml +++ b/libX11/specs/libX11/CH05.xml @@ -53,7 +53,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies which screen the pixmap is created on. -<!-- .ds Wh , which define the dimensions of the pixmap --> </para> </listitem> </varlistentry> @@ -74,7 +73,7 @@ Specifies which screen the pixmap is created on. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which define the dimensions of the pixmap. </para> </listitem> </varlistentry> @@ -497,7 +496,6 @@ Specifies the <acronym>RGB</acronym> values for the foreground of the source. <listitem> <para> Specifies the <acronym>RGB</acronym> values for the background of the source. -<!-- .ds Xy , which indicate the hotspot relative to the source's origin --> </para> </listitem> </varlistentry> @@ -518,7 +516,8 @@ Specifies the <acronym>RGB</acronym> values for the background of the source. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which indicate the hotspot relative to the +source's origin. </para> </listitem> </varlistentry> @@ -600,7 +599,6 @@ To determine useful cursor sizes, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Dr , which indicates the screen --> </para> </listitem> </varlistentry> @@ -610,8 +608,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the drawable(Dr. -<!-- .ds Wh \ of the cursor that you want the size information for --> +Specifies the drawable, which indicates the screen. </para> </listitem> </varlistentry> @@ -632,7 +629,8 @@ Specifies the drawable(Dr. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height of the cursor that you want the size +information for. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH06.xml b/libX11/specs/libX11/CH06.xml index b84ce95cc..a82a5e231 100644 --- a/libX11/specs/libX11/CH06.xml +++ b/libX11/specs/libX11/CH06.xml @@ -832,7 +832,6 @@ To create a colormap for a screen, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi on whose screen you want to create a colormap --> </para> </listitem> </varlistentry> @@ -842,7 +841,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window on whose screen you want to create a colormap. </para> </listitem> </varlistentry> @@ -1056,7 +1055,6 @@ To destroy a colormap, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Cm that you want to destroy --> </para> </listitem> </varlistentry> @@ -1066,7 +1064,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the colormap (Cm. +Specifies the colormap that you want to destroy. </para> </listitem> </varlistentry> @@ -1792,7 +1790,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the colormap. -<!-- .ds St \ whose color definition structure is to be returned --> </para> </listitem> </varlistentry> @@ -1802,7 +1799,8 @@ Specifies the colormap. </term> <listitem> <para> -Specifies the color string(St. +Specifies the color string whose color definition structure is to be +returned. </para> </listitem> </varlistentry> @@ -2296,7 +2294,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the colormap. -<!-- .ds Pi that map to the cells in the specified colormap --> </para> </listitem> </varlistentry> @@ -2306,7 +2303,8 @@ Specifies the colormap. </term> <listitem> <para> -Specifies an array of pixel values (Pi. +Specifies an array of pixel values that map to the cells in the specified +colormap. </para> </listitem> </varlistentry> @@ -3811,7 +3809,6 @@ To set the Client White Point in the CCC, use <listitem> <para> Specifies the CCC. -<!-- .ds Co new Client White Point --> </para> </listitem> </varlistentry> @@ -3899,7 +3896,6 @@ a color specification to a device-dependent format and encounters a color that lies outside the screen's color gamut, that function will return <symbol>XcmsFailure</symbol>. -<!-- .ds Cd the gamut compression procedure --> </para> </listitem> </varlistentry> @@ -3962,7 +3958,6 @@ Specifies the CCC. <listitem> <para> Specifies the white point adjustment procedure. -<!-- .ds Cd the white point adjustment procedure --> </para> </listitem> </varlistentry> @@ -5049,7 +5044,6 @@ are ignored. <listitem> <para> Specifies the target color specification format. -<!-- .ds Cs zero-intensity red, green, and blue --> </para> </listitem> </varlistentry> @@ -5060,7 +5054,7 @@ Specifies the target color specification format. <listitem> <para> Returns the color specification in the specified target format -for (Cs. +for zero-intensity red, green, and blue. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5115,7 +5109,6 @@ are ignored. <listitem> <para> Specifies the target color specification format. -<!-- .ds Cs full-intensity blue while red and green are zero --> </para> </listitem> </varlistentry> @@ -5126,7 +5119,7 @@ Specifies the target color specification format. <listitem> <para> Returns the color specification in the specified target format -for (Cs. +for full-intensity blue while red and green are zero. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5181,7 +5174,6 @@ are ignored. <listitem> <para> Specifies the target color specification format. -<!-- .ds Cs full-intensity green while red and blue are zero --> </para> </listitem> </varlistentry> @@ -5192,7 +5184,7 @@ Specifies the target color specification format. <listitem> <para> Returns the color specification in the specified target format -for (Cs. +for full-intensity green while red and blue are zero. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5247,7 +5239,6 @@ are ignored. <listitem> <para> Specifies the target color specification format. -<!-- .ds Cs full-intensity red while green and blue are zero --> </para> </listitem> </varlistentry> @@ -5258,7 +5249,7 @@ Specifies the target color specification format. <listitem> <para> Returns the color specification in the specified target format -for (Cs. +for full-intensity red while green and blue are zero. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5313,7 +5304,6 @@ are ignored. <listitem> <para> Specifies the target color specification format. -<!-- .ds Cs full-intensity red, green, and blue --> </para> </listitem> </varlistentry> @@ -5324,7 +5314,7 @@ Specifies the target color specification format. <listitem> <para> Returns the color specification in the specified target format -for (Cs. +for full-intensity red, green, and blue. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5392,7 +5382,6 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness ( Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum chroma --> </para> </listitem> </varlistentry> @@ -5402,8 +5391,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ls maximum chroma --> +Specifies the hue angle (in degrees) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5413,9 +5401,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the lightness (L*) at which to find (Ls. -<!-- .ds Lc maximum chroma --> -<!-- .ds lC hue angle and lightness --> +Specifies the lightness (L*) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5425,8 +5411,8 @@ Specifies the lightness (L*) at which to find (Ls. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum chroma +displayable by the screen for the given hue angle and lightness. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5476,7 +5462,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum lightness --> </para> </listitem> </varlistentry> @@ -5486,8 +5471,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ch maximum lightness --> +Specifies the hue angle (in degrees) at which to find maximum lightness. </para> </listitem> </varlistentry> @@ -5497,9 +5481,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the chroma at which to find (Ch. -<!-- .ds Lc maximum lightness --> -<!-- .ds lC hue angle and chroma --> +Specifies the chroma at which to find maximum lightness. </para> </listitem> </varlistentry> @@ -5509,8 +5491,8 @@ Specifies the chroma at which to find (Ch. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum lightness +displayable by the screen for the given hue angle and chroma. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5566,7 +5548,6 @@ for a given Psychometric Hue Angle, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum chroma --> </para> </listitem> </varlistentry> @@ -5576,9 +5557,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Lc maximum chroma --> -<!-- .ds lC hue angle --> +Specifies the hue angle (in degrees) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5588,8 +5567,8 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*a*b* coordinates of maximum chroma +displayable by the screen for the given hue angle. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5639,7 +5618,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha minimum lightness --> </para> </listitem> </varlistentry> @@ -5649,8 +5627,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ch minimum lightness --> +Specifies the hue angle (in degrees) at which to find minimum lightness. </para> </listitem> </varlistentry> @@ -5660,9 +5637,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the chroma at which to find (Ch. -<!-- .ds Lc minimum lightness --> -<!-- .ds lC hue angle and chroma --> +Specifies the chroma at which to find minimum lightness. </para> </listitem> </varlistentry> @@ -5672,8 +5647,8 @@ Specifies the chroma at which to find (Ch. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*a*b* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*a*b* coordinates of minimum lightness +displayable by the screen for the given hue angle and chroma. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5749,7 +5724,6 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness ( Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum chroma --> </para> </listitem> </varlistentry> @@ -5759,8 +5733,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ls maximum chroma --> +Specifies the hue angle (in degrees) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5770,9 +5743,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the lightness (L*) at which to find (Ls. -<!-- .ds Lc maximum chroma --> -<!-- .ds lC hue angle and lightness --> +Specifies the lightness (L*) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5782,8 +5753,8 @@ Specifies the lightness (L*) at which to find (Ls. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum chroma +displayable by the screen for the given hue angle and lightness. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5833,7 +5804,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum lightness --> </para> </listitem> </varlistentry> @@ -5843,8 +5813,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ls maximum lightness --> +Specifies the hue angle (in degrees) at which to find maximum lightness. </para> </listitem> </varlistentry> @@ -5854,9 +5823,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the lightness (L*) at which to find (Ls. -<!-- .ds Lc maximum lightness --> -<!-- .ds lC hue angle and chroma --> +Specifies the lightness (L*) at which to find maximum lightness. </para> </listitem> </varlistentry> @@ -5866,8 +5833,8 @@ Specifies the lightness (L*) at which to find (Ls. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum lightness +displayable by the screen for the given hue angle and chroma. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5923,7 +5890,6 @@ for a given Psychometric Hue Angle, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha maximum chroma --> </para> </listitem> </varlistentry> @@ -5933,9 +5899,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Lc maximum chroma --> -<!-- .ds lC hue angle --> +Specifies the hue angle (in degrees) at which to find maximum chroma. </para> </listitem> </varlistentry> @@ -5945,8 +5909,8 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*u*v* coordinates of maximum chroma +displayable by the screen for the given hue angle. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -5996,7 +5960,6 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Ha minimum lightness --> </para> </listitem> </varlistentry> @@ -6006,8 +5969,7 @@ are ignored. </term> <listitem> <para> -Specifies the hue angle (in degrees) at which to find (Ha. -<!-- .ds Ch minimum lightness --> +Specifies the hue angle (in degrees) at which to find minimum lightness. </para> </listitem> </varlistentry> @@ -6017,9 +5979,7 @@ Specifies the hue angle (in degrees) at which to find (Ha. </term> <listitem> <para> -Specifies the chroma at which to find (Ch. -<!-- .ds Lc minimum lightness --> -<!-- .ds lC hue angle and chroma --> +Specifies the chroma at which to find minimum lightness. </para> </listitem> </varlistentry> @@ -6029,8 +5989,8 @@ Specifies the chroma at which to find (Ch. </term> <listitem> <para> -Returns the <acronym>CIE</acronym> L*u*v* coordinates of (Lc -displayable by the screen for the given (lC. +Returns the <acronym>CIE</acronym> L*u*v* coordinates of minimum lightness +displayable by the screen for the given hue angle and chroma. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -6087,7 +6047,6 @@ To obtain the maximum Chroma for a given Hue and Value, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Hu in which to find the maximum Chroma --> </para> </listitem> </varlistentry> @@ -6097,8 +6056,7 @@ are ignored. </term> <listitem> <para> -Specifies the Hue (Hu. -<!-- .ds Va maximum Chroma --> +Specifies the Hue in which to find the maximum Chroma. </para> </listitem> </varlistentry> @@ -6108,9 +6066,7 @@ Specifies the Hue (Hu. </term> <listitem> <para> -Specifies the Value in which to find the (Va. -<!-- .ds Lc maximum Chroma along with the actual Hue and Value --> -<!-- .ds lC maximum Chroma --> +Specifies the Value in which to find the maximum Chroma. </para> </listitem> </varlistentry> @@ -6120,7 +6076,8 @@ Specifies the Value in which to find the (Va. </term> <listitem> <para> -Returns the (Lc at which the (lC was found. +Returns the maximum Chroma along with the actual Hue and Value at which +the maximum Chroma was found. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -6170,7 +6127,6 @@ To obtain the maximum Value for a given Hue and Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Hu in which to find the maximum Value --> </para> </listitem> </varlistentry> @@ -6180,8 +6136,7 @@ are ignored. </term> <listitem> <para> -Specifies the Hue (Hu. -<!-- .ds Ch maximum Value --> +Specifies the Hue in which to find the maximum Value. </para> </listitem> </varlistentry> @@ -6191,9 +6146,7 @@ Specifies the Hue (Hu. </term> <listitem> <para> -Specifies the chroma at which to find (Ch. -<!-- .ds Lc maximum Value along with the Hue and Chroma --> -<!-- .ds lC maximum Value --> +Specifies the chroma at which to find maximum Value. </para> </listitem> </varlistentry> @@ -6203,7 +6156,9 @@ Specifies the chroma at which to find (Ch. </term> <listitem> <para> -Returns the (Lc at which the (lC was found. +Returns the maximum Value along with the Hue and Chroma at which the +maximum Value +was found. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -6256,7 +6211,6 @@ for a specified Hue, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Hu in which to find the maximum Chroma --> </para> </listitem> </varlistentry> @@ -6266,11 +6220,7 @@ are ignored. </term> <listitem> <para> -Specifies the Hue (Hu. -<!-- .ds Lc color specification in \ --> -XcmsTekHVC for the maximum Chroma, the Value at which \ -that maximum Chroma is reached, and the actual Hue -<!-- .ds lC maximum Chroma --> +Specifies the Hue in which to find the maximum Chroma. </para> </listitem> </varlistentry> @@ -6280,7 +6230,9 @@ that maximum Chroma is reached, and the actual Hue </term> <listitem> <para> -Returns the (Lc at which the (lC was found. +Returns the color specification in XcmsTekHVC for the maximum Chroma, the +Value at which that maximum Chroma is reached, and the actual Hue at which +the maximum Chroma was found. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. @@ -6335,7 +6287,6 @@ Chroma at which the maximum Values are reached, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Hu for maximum Chroma/Value samples --> </para> </listitem> </varlistentry> @@ -6345,7 +6296,7 @@ are ignored. </term> <listitem> <para> -Specifies the Hue (Hu. +Specifies the Hue for maximum Chroma/Value samples. </para> </listitem> </varlistentry> @@ -6416,7 +6367,6 @@ To obtain the minimum Value for a given Hue and Chroma, use Specifies the CCC. The CCC's Client White Point and white point adjustment procedures are ignored. -<!-- .ds Hu in which to find the minimum Value --> </para> </listitem> </varlistentry> @@ -6426,8 +6376,7 @@ are ignored. </term> <listitem> <para> -Specifies the Hue (Hu. -<!-- .ds Va minimum Value --> +Specifies the Hue in which to find the minimum Value. </para> </listitem> </varlistentry> @@ -6437,9 +6386,7 @@ Specifies the Hue (Hu. </term> <listitem> <para> -Specifies the Value in which to find the (Va. -<!-- .ds Lc minimum Value and the actual Hue and Chroma --> -<!-- .ds lC minimum Value --> +Specifies the Value in which to find the minimum Value. </para> </listitem> </varlistentry> @@ -6449,7 +6396,9 @@ Specifies the Value in which to find the (Va. </term> <listitem> <para> -Returns the (Lc at which the (lC was found. +Returns the minimum Value and the actual Hue and Chroma at which the +minimum Value +was found. The white point associated with the returned color specification is the Screen White Point. The value returned in the pixel member is undefined. diff --git a/libX11/specs/libX11/CH07.xml b/libX11/specs/libX11/CH07.xml index b50dc8363..fc3f44d18 100644 --- a/libX11/specs/libX11/CH07.xml +++ b/libX11/specs/libX11/CH07.xml @@ -994,7 +994,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the drawable. -<!-- .ds Vm set using the information in the specified values structure --> </para> </listitem> </varlistentry> @@ -1004,7 +1003,8 @@ Specifies the drawable. </term> <listitem> <para> -Specifies which components in the GC are to be (Vm. +Specifies which components in the GC are to be set using the information in +the specified values structure. This argument is the bitwise inclusive OR of zero or more of the valid GC component mask bits. </para> @@ -1081,7 +1081,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the components of the source GC. -<!-- .ds Vm copied to the destination GC --> </para> </listitem> </varlistentry> @@ -1091,7 +1090,8 @@ Specifies the components of the source GC. </term> <listitem> <para> -Specifies which components in the GC are to be (Vm. +Specifies which components in the GC are to be copied to the destination +GC. This argument is the bitwise inclusive OR of zero or more of the valid GC component mask bits. </para> @@ -1168,7 +1168,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the GC. -<!-- .ds Vm changed using information in the specified values structure --> </para> </listitem> </varlistentry> @@ -1178,7 +1177,8 @@ Specifies the GC. </term> <listitem> <para> -Specifies which components in the GC are to be (Vm. +Specifies which components in the GC are to be changed using information in +the specified values structure. This argument is the bitwise inclusive OR of zero or more of the valid GC component mask bits. </para> @@ -1264,7 +1264,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the GC. -<!-- .ds Vm returned in the values_return argument --> </para> </listitem> </varlistentry> @@ -1274,7 +1273,8 @@ Specifies the GC. </term> <listitem> <para> -Specifies which components in the GC are to be (Vm. +Specifies which components in the GC are to be returned in the +values_return argument. This argument is the bitwise inclusive OR of zero or more of the valid GC component mask bits. </para> @@ -1409,7 +1409,6 @@ resource ID for a given GC, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Gc for which you want the resource ID --> <variablelist> <varlistentry> <term> @@ -1417,7 +1416,7 @@ resource ID for a given GC, use </term> <listitem> <para> -Specifies the GC (Gc. +Specifies the GC for which you want the resource ID. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH08.xml b/libX11/specs/libX11/CH08.xml index e4afa37fa..fb76c84d8 100644 --- a/libX11/specs/libX11/CH08.xml +++ b/libX11/specs/libX11/CH08.xml @@ -73,8 +73,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the window. -<!-- .ds Xy , which are relative to the origin of the window \ --> -and specify the upper-left corner of the rectangle </para> </listitem> </varlistentry> @@ -95,8 +93,8 @@ and specify the upper-left corner of the rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the dimensions of the rectangle --> +Specify the x and y coordinates, which are relative to the origin of the +window and specify the upper-left corner of the rectangle. </para> </listitem> </varlistentry> @@ -117,7 +115,7 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the dimensions of the rectangle. </para> </listitem> </varlistentry> @@ -344,8 +342,6 @@ Specifies the GC. Specify the x and y coordinates, which are relative to the origin of the source rectangle and specify its upper-left corner. -<!-- .ds Wh , which are the dimensions of both the source \ --> -and destination rectangles </para> </listitem> </varlistentry> @@ -366,9 +362,8 @@ and destination rectangles </term> <listitem> <para> -Specify the width and height(Wh. -<!-- .ds Dx , which are relative to the origin of the destination rectangle \ --> -and specify its upper-left corner +Specify the width and height, which are the dimensions of both the source +and destination rectangles. </para> </listitem> </varlistentry> @@ -389,7 +384,8 @@ and specify its upper-left corner </term> <listitem> <para> -Specify the x and y coordinates(Dx. +Specify the x and y coordinates, which are relative to the origin of the +destination rectangle and specify its upper-left corner. </para> </listitem> </varlistentry> @@ -540,7 +536,6 @@ Specifies the GC. Specify the x and y coordinates, which are relative to the origin of the source rectangle and specify its upper-left corner. -<!-- .ds Wh , which are the dimensions of both the source and destination rectangles --> </para> </listitem> </varlistentry> @@ -561,9 +556,8 @@ and specify its upper-left corner. </term> <listitem> <para> -Specify the width and height(Wh. -<!-- .ds Dx , which are relative to the origin of the destination rectangle \ --> -and specify its upper-left corner +Specify the width and height, which are the dimensions of both the source +and destination rectangles. </para> </listitem> </varlistentry> @@ -584,7 +578,8 @@ and specify its upper-left corner </term> <listitem> <para> -Specify the x and y coordinates(Dx. +Specify the x and y coordinates, which are relative to the origin of the +destination rectangle and specify its upper-left corner. </para> </listitem> </varlistentry> @@ -1373,7 +1368,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which specify the upper-left corner of the rectangle --> </para> </listitem> </varlistentry> @@ -1394,8 +1388,8 @@ Specifies the GC. </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which specify the dimensions of the rectangle --> +Specify the x and y coordinates, which specify the upper-left corner of the +rectangle. </para> </listitem> </varlistentry> @@ -1416,7 +1410,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which specify the dimensions of the +rectangle. </para> </listitem> </varlistentry> @@ -1605,8 +1600,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the drawable \ --> -and specify the upper-left corner of the bounding rectangle </para> </listitem> </varlistentry> @@ -1627,8 +1620,8 @@ and specify the upper-left corner of the bounding rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the major and minor axes of the arc --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and specify the upper-left corner of the bounding rectangle. </para> </listitem> </varlistentry> @@ -1649,7 +1642,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the major and minor axes of the +arc. </para> </listitem> </varlistentry> @@ -1962,8 +1956,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the drawable \ --> -and specify the upper-left corner of the rectangle </para> </listitem> </varlistentry> @@ -1984,8 +1976,8 @@ and specify the upper-left corner of the rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the dimensions of the rectangle to be filled --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and specify the upper-left corner of the rectangle. </para> </listitem> </varlistentry> @@ -2006,7 +1998,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the dimensions of the rectangle to +be filled. </para> </listitem> </varlistentry> @@ -2394,8 +2387,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the drawable \ --> -and specify the upper-left corner of the bounding rectangle </para> </listitem> </varlistentry> @@ -2416,8 +2407,8 @@ and specify the upper-left corner of the bounding rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which are the major and minor axes of the arc --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and specify the upper-left corner of the bounding rectangle. </para> </listitem> </varlistentry> @@ -2438,7 +2429,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which are the major and minor axes of the +arc. </para> </listitem> </varlistentry> @@ -4523,8 +4515,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -4545,7 +4535,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -4619,8 +4610,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -4641,7 +4630,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -4780,8 +4770,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -4802,7 +4790,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -4876,8 +4865,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -4898,7 +4885,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -5020,8 +5008,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -5042,7 +5028,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -5116,8 +5103,6 @@ Specifies the drawable. <listitem> <para> Specifies the GC. -<!-- .ds Xy , which are relative to the origin of the specified drawable \ --> -and define the origin of the first character </para> </listitem> </varlistentry> @@ -5138,7 +5123,8 @@ and define the origin of the first character </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which are relative to the origin of the +specified drawable and define the origin of the first character. </para> </listitem> </varlistentry> @@ -5456,8 +5442,6 @@ Specifies the offset in Y from the top edge of the image defined by the <structname>XImage</structname> structure. -<!-- .ds Dx , which are relative to the origin of the drawable \ --> -and are the coordinates of the subimage </para> </listitem> </varlistentry> @@ -5478,8 +5462,8 @@ and are the coordinates of the subimage </term> <listitem> <para> -Specify the x and y coordinates(Dx. -<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and are the coordinates of the subimage. </para> </listitem> </varlistentry> @@ -5500,7 +5484,8 @@ Specify the x and y coordinates(Dx. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height of the subimage, which define the dimensions +of the rectangle. </para> </listitem> </varlistentry> @@ -5598,8 +5583,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the drawable. -<!-- .ds Xy , which are relative to the origin of the drawable \ --> -and define the upper-left corner of the rectangle </para> </listitem> </varlistentry> @@ -5620,8 +5603,8 @@ and define the upper-left corner of the rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and define the upper-left corner of the rectangle. </para> </listitem> </varlistentry> @@ -5642,7 +5625,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height of the subimage, which define the dimensions +of the rectangle. </para> </listitem> </varlistentry> @@ -5787,8 +5771,6 @@ Specifies the connection to the X server. <listitem> <para> Specifies the drawable. -<!-- .ds Xy , which are relative to the origin of the drawable \ --> -and define the upper-left corner of the rectangle </para> </listitem> </varlistentry> @@ -5809,8 +5791,8 @@ and define the upper-left corner of the rectangle </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh \ of the subimage, which define the dimensions of the rectangle --> +Specify the x and y coordinates, which are relative to the origin of the +drawable and define the upper-left corner of the rectangle. </para> </listitem> </varlistentry> @@ -5831,7 +5813,8 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height of the subimage, which define the dimensions +of the rectangle. </para> </listitem> </varlistentry> @@ -5867,9 +5850,6 @@ or <listitem> <para> Specifies the destination image. -<!-- .ds Dx , which are relative to the origin of the destination rectangle, \ --> -specify its upper-left corner, and determine where the subimage \ -is placed in the destination image </para> </listitem> </varlistentry> @@ -5890,7 +5870,9 @@ is placed in the destination image </term> <listitem> <para> -Specify the x and y coordinates(Dx. +Specify the x and y coordinates, which are relative to the origin of the +destination rectangle, specify its upper-left corner, and determine where +the subimage is placed in the destination image. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH09.xml b/libX11/specs/libX11/CH09.xml index 5636df149..d5d93d0a0 100644 --- a/libX11/specs/libX11/CH09.xml +++ b/libX11/specs/libX11/CH09.xml @@ -74,7 +74,6 @@ Specifies the window. <listitem> <para> Specifies the parent window. -<!-- .ds Xy \ of the position in the new parent window --> </para> </listitem> </varlistentry> @@ -95,7 +94,7 @@ Specifies the parent window. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates of the position in the new parent window. </para> </listitem> </varlistentry> @@ -237,7 +236,6 @@ To add or remove a window from the client's save-set, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi that you want to add to or delete from the client's save-set --> </para> </listitem> </varlistentry> @@ -247,7 +245,8 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window that you want to add to or delete from the client's +save-set. </para> </listitem> </varlistentry> @@ -311,7 +310,6 @@ To add a window to the client's save-set, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi that you want to add to the client's save-set --> </para> </listitem> </varlistentry> @@ -321,7 +319,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window that you want to add to the client's save-set. </para> </listitem> </varlistentry> @@ -370,7 +368,6 @@ To remove a window from the client's save-set, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi that you want to delete from the client's save-set --> </para> </listitem> </varlistentry> @@ -380,7 +377,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window that you want to delete from the client's save-set. </para> </listitem> </varlistentry> @@ -612,7 +609,6 @@ To obtain a list of the currently installed colormaps for a given screen, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi that determines the screen --> </para> </listitem> </varlistentry> @@ -622,7 +618,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window that determines the screen. </para> </listitem> </varlistentry> @@ -1549,7 +1545,6 @@ To add a single host, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Ho added --> </para> </listitem> </varlistentry> @@ -1559,7 +1554,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the host that is to be (Ho. +Specifies the host that is to be added. </para> </listitem> </varlistentry> @@ -1608,7 +1603,6 @@ To add multiple hosts at one time, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Ho added --> </para> </listitem> </varlistentry> @@ -1618,7 +1612,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies each host that is to be (Ho. +Specifies each host that is to be added. </para> </listitem> </varlistentry> @@ -1740,7 +1734,6 @@ To remove a single host, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Ho removed --> </para> </listitem> </varlistentry> @@ -1750,7 +1743,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the host that is to be (Ho. +Specifies the host that is to be removed. </para> </listitem> </varlistentry> @@ -1803,7 +1796,6 @@ To remove multiple hosts at one time, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Ho removed --> </para> </listitem> </varlistentry> @@ -1813,7 +1805,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies each host that is to be (Ho. +Specifies each host that is to be removed. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH11.xml b/libX11/specs/libX11/CH11.xml index 001e05d8f..2d0fa0fe6 100644 --- a/libX11/specs/libX11/CH11.xml +++ b/libX11/specs/libX11/CH11.xml @@ -63,7 +63,6 @@ Another way is to use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose events you are interested in --> </para> </listitem> </varlistentry> @@ -73,7 +72,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose events you are interested in. </para> </listitem> </varlistentry> @@ -926,7 +925,6 @@ To remove the next event that matches both a window and an event mask, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose events you are interested in --> </para> </listitem> </varlistentry> @@ -936,7 +934,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose events you are interested in. </para> </listitem> </varlistentry> @@ -1011,7 +1009,6 @@ indicating if the event was returned. <listitem> <para> Specifies the connection to the X server. -<!-- .ds Wi whose events you are interested in --> </para> </listitem> </varlistentry> @@ -1021,7 +1018,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window whose events you are interested in. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH12.xml b/libX11/specs/libX11/CH12.xml index cc14fe649..43953e16b 100644 --- a/libX11/specs/libX11/CH12.xml +++ b/libX11/specs/libX11/CH12.xml @@ -605,7 +605,6 @@ To grab a pointer button, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Bu grabbed --> </para> </listitem> </varlistentry> @@ -615,7 +614,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the pointer button that is to be (Bu or +Specifies the pointer button that is to be grabbed or <symbol>AnyButton</symbol>. </para> </listitem> @@ -844,7 +843,6 @@ To ungrab a pointer button, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Bu released --> </para> </listitem> </varlistentry> @@ -854,7 +852,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the pointer button that is to be (Bu or +Specifies the pointer button that is to be released or <symbol>AnyButton</symbol>. </para> </listitem> @@ -3303,7 +3301,6 @@ To obtain the symbols for the specified KeyCodes, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Kc returned --> </para> </listitem> </varlistentry> @@ -3313,7 +3310,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the first KeyCode that is to be (Kc. +Specifies the first KeyCode that is to be returned. </para> </listitem> </varlistentry> @@ -3429,7 +3426,6 @@ To change the keyboard mapping, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Kc changed --> </para> </listitem> </varlistentry> @@ -3439,7 +3435,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the first KeyCode that is to be (Kc. +Specifies the first KeyCode that is to be changed. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH13.xml b/libX11/specs/libX11/CH13.xml index e710414c8..096d86097 100644 --- a/libX11/specs/libX11/CH13.xml +++ b/libX11/specs/libX11/CH13.xml @@ -862,7 +862,6 @@ To set output method attributes, use <listitem> <para> Specifies the output method. -<!-- .ds Al \ to set <acronym>XOM</acronym> values --> </para> </listitem> </varlistentry> @@ -872,7 +871,8 @@ Specifies the output method. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to set <acronym>XOM</acronym> +values. </para> </listitem> </varlistentry> @@ -915,7 +915,6 @@ To query an output method, use <listitem> <para> Specifies the output method. -<!-- .ds Al \ to get XOM values --> </para> </listitem> </varlistentry> @@ -925,7 +924,7 @@ Specifies the output method. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to get XOM values. </para> </listitem> </varlistentry> @@ -1337,7 +1336,6 @@ To create an output context, use <listitem> <para> Specifies the output method. -<!-- .ds Al \ to set <acronym>XOC</acronym> values --> </para> </listitem> </varlistentry> @@ -1347,7 +1345,8 @@ Specifies the output method. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to set <acronym>XOC</acronym> +values. </para> </listitem> </varlistentry> @@ -1504,7 +1503,6 @@ To set <acronym>XOC</acronym> values, use <listitem> <para> Specifies the output context. -<!-- .ds Al \ to set <acronym>XOC</acronym> values --> </para> </listitem> </varlistentry> @@ -1514,7 +1512,8 @@ Specifies the output context. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to set <acronym>XOC</acronym> +values. </para> </listitem> </varlistentry> @@ -1581,7 +1580,6 @@ To obtain <acronym>XOC</acronym> values, use <listitem> <para> Specifies the output context. -<!-- .ds Al \ to get XOC values --> </para> </listitem> </varlistentry> @@ -1591,7 +1589,7 @@ Specifies the output context. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to get XOC values. </para> </listitem> </varlistentry> @@ -3170,7 +3168,6 @@ Specifies the number of bytes in the string argument. <listitem> <para> Specifies the number of characters in the string argument. -<!-- .ds Ov dimensions --> </para> </listitem> </varlistentry> @@ -3379,7 +3376,6 @@ The caller must pass in arrays of this size. <listitem> <para> Returns the number of characters in the string argument. -<!-- .ds Ov extents of the entire string --> </para> </listitem> </varlistentry> @@ -3626,7 +3622,7 @@ Specifies the GC. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates of the position in the new parent window. </para> </listitem> </varlistentry> @@ -3789,7 +3785,7 @@ Specifies the GC. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates of the position in the new parent window. </para> </listitem> </varlistentry> @@ -3935,7 +3931,7 @@ Specifies the GC. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates of the position in the new parent window. </para> </listitem> </varlistentry> @@ -5328,7 +5324,6 @@ To set input method attributes, use <listitem> <para> Specifies the input method. -<!-- .ds Al \ to set <acronym>XIM</acronym> values --> </para> </listitem> </varlistentry> @@ -5338,7 +5333,8 @@ Specifies the input method. </term> <listitem> <para> -Specifies the variable-length argument list(Al. +Specifies the variable-length argument list to set <acronym>XIM</acronym> +values. </para> </listitem> </varlistentry> @@ -5381,7 +5377,6 @@ To query an input method, use <listitem> <para> Specifies the input method. -<!-- .ds Al \ to get XIM values --> </para> </listitem> </varlistentry> @@ -5391,7 +5386,7 @@ Specifies the input method. </term> <listitem> <para> -Specifies the variable length argument list(Al. +Specifies the variable length argument list to get XIM values. </para> </listitem> </varlistentry> @@ -6339,7 +6334,6 @@ To create an input context, use <listitem> <para> Specifies the input method. -<!-- .ds Al \ to set <acronym>XIC</acronym> values --> </para> </listitem> </varlistentry> @@ -6349,7 +6343,8 @@ Specifies the input method. </term> <listitem> <para> -Specifies the variable length argument list(Al. +Specifies the variable length argument list to set <acronym>XIC</acronym> +values. </para> </listitem> </varlistentry> @@ -6675,7 +6670,6 @@ To set <acronym>XIC</acronym> values, use <listitem> <para> Specifies the input context. -<!-- .ds Al \ to set <acronym>XIC</acronym> values --> </para> </listitem> </varlistentry> @@ -6685,7 +6679,8 @@ Specifies the input context. </term> <listitem> <para> -Specifies the variable length argument list(Al. +Specifies the variable length argument list to set <acronym>XIC</acronym> +values. </para> </listitem> </varlistentry> @@ -6758,7 +6753,6 @@ To obtain <acronym>XIC</acronym> values, use <listitem> <para> Specifies the input context. -<!-- .ds Al \ to get XIC values --> </para> </listitem> </varlistentry> @@ -6768,7 +6762,7 @@ Specifies the input context. </term> <listitem> <para> -Specifies the variable length argument list(Al. +Specifies the variable length argument list to get XIC values. </para> </listitem> </varlistentry> @@ -9881,7 +9875,6 @@ To filter an event, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Ev event to filter --> <variablelist> <varlistentry> <term> @@ -9889,8 +9882,7 @@ To filter an event, use </term> <listitem> <para> -Specifies the (Ev. -<!-- .ds Wi for which the filter is to be applied --> +Specifies the event to filter. </para> </listitem> </varlistentry> @@ -9900,7 +9892,7 @@ Specifies the (Ev. </term> <listitem> <para> -Specifies the window (Wi. +Specifies the window for which the filter is to be applied. </para> </listitem> </varlistentry> @@ -9989,7 +9981,6 @@ or <listitem> <para> Specifies the input context. -<!-- .ds Ev key event to be used --> </para> </listitem> </varlistentry> @@ -9999,7 +9990,7 @@ Specifies the input context. </term> <listitem> <para> -Specifies the (Ev. +Specifies the key event to be used. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH14.xml b/libX11/specs/libX11/CH14.xml index 6dc947a9c..d7bbf5e67 100644 --- a/libX11/specs/libX11/CH14.xml +++ b/libX11/specs/libX11/CH14.xml @@ -799,7 +799,6 @@ structure to be used. <listitem> <para> Returns a list of null-terminated character strings. -<!-- .ds Cn strings --> </para> </listitem> </varlistentry> @@ -809,7 +808,7 @@ Returns a list of null-terminated character strings. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of strings. </para> </listitem> </varlistentry> @@ -1008,7 +1007,6 @@ structure, use <listitem> <para> Specifies a list of null-terminated character strings. -<!-- .ds Cn strings --> </para> </listitem> </varlistentry> @@ -1018,7 +1016,7 @@ Specifies a list of null-terminated character strings. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of strings. </para> </listitem> </varlistentry> @@ -1095,7 +1093,6 @@ structure to be used. <listitem> <para> Returns a list of null-terminated character strings. -<!-- .ds Cn strings --> </para> </listitem> </varlistentry> @@ -1105,7 +1102,7 @@ Returns a list of null-terminated character strings. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of strings. </para> </listitem> </varlistentry> @@ -3221,7 +3218,6 @@ Specifies the window. <listitem> <para> Specifies the list of protocols. -<!-- .ds Cn protocols in the list --> </para> </listitem> </varlistentry> @@ -3231,7 +3227,7 @@ Specifies the list of protocols. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of protocols in the list. </para> </listitem> </varlistentry> @@ -3308,7 +3304,6 @@ Specifies the window. <listitem> <para> Returns the list of protocols. -<!-- .ds Cn protocols in the list --> </para> </listitem> </varlistentry> @@ -3318,7 +3313,7 @@ Returns the list of protocols. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of protocols in the list. </para> </listitem> </varlistentry> @@ -3407,7 +3402,6 @@ Specifies the window. <listitem> <para> Specifies the list of windows. -<!-- .ds Cn windows in the list --> </para> </listitem> </varlistentry> @@ -3417,7 +3411,7 @@ Specifies the list of windows. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of windows in the list. </para> </listitem> </varlistentry> @@ -3494,7 +3488,6 @@ Specifies the window. <listitem> <para> Returns the list of windows. -<!-- .ds Cn windows in the list --> </para> </listitem> </varlistentry> @@ -3504,7 +3497,7 @@ Returns the list of windows. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of windows in the list. </para> </listitem> </varlistentry> @@ -4980,7 +4973,6 @@ Specifies the window. Specifies the <structname>XStandardColormap</structname> structure to be used. -<!-- .ds Cn colormaps --> </para> </listitem> </varlistentry> @@ -4990,7 +4982,7 @@ structure to be used. </term> <listitem> <para> -Specifies the number of (Cn. +Specifies the number of colormaps. </para> </listitem> </varlistentry> @@ -5160,7 +5152,6 @@ Specifies the window. Returns the <structname>XStandardColormap</structname> structure. -<!-- .ds Cn colormaps --> </para> </listitem> </varlistentry> @@ -5170,7 +5161,7 @@ structure. </term> <listitem> <para> -Returns the number of (Cn. +Returns the number of colormaps. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH15.xml b/libX11/specs/libX11/CH15.xml index f6c76a481..2180c6d6c 100644 --- a/libX11/specs/libX11/CH15.xml +++ b/libX11/specs/libX11/CH15.xml @@ -532,7 +532,6 @@ To convert a string with one or more components to a quark list, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Ql \ list --> <variablelist> <varlistentry> <term> @@ -540,7 +539,7 @@ To convert a string with one or more components to a quark list, use </term> <listitem> <para> -Specifies the string for which a quark(Ql is to be allocated. +Specifies the string for which a quark list is to be allocated. </para> </listitem> </varlistentry> @@ -608,7 +607,6 @@ and a quark list, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Ql \ list --> <variablelist> <varlistentry> <term> @@ -616,7 +614,7 @@ and a quark list, use </term> <listitem> <para> -Specifies the string for which a quark(Ql is to be allocated. +Specifies the string for which a quark list is to be allocated. </para> </listitem> </varlistentry> diff --git a/libX11/specs/libX11/CH16.xml b/libX11/specs/libX11/CH16.xml index e70b79939..790cb0118 100644 --- a/libX11/specs/libX11/CH16.xml +++ b/libX11/specs/libX11/CH16.xml @@ -320,7 +320,6 @@ To obtain the uppercase and lowercase forms of a KeySym, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Fn converted --> <variablelist> <varlistentry> <term> @@ -328,7 +327,7 @@ To obtain the uppercase and lowercase forms of a KeySym, use </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be converted. </para> </listitem> </varlistentry> @@ -431,7 +430,6 @@ To convert a KeySym code to the name of the KeySym, use </funcprototype> </funcsynopsis> <!-- .FN --> -<!-- .ds Fn converted --> <variablelist> <varlistentry> <term> @@ -439,7 +437,7 @@ To convert a KeySym code to the name of the KeySym, use </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be converted. </para> </listitem> </varlistentry> @@ -466,7 +464,6 @@ You can use KeySym macros to perform the following tests. </para> <para>IsCursorKey(<emphasis remap='I'>keysym</emphasis>)</para> <!-- .FN --> -<!-- .ds Fn tested --> <variablelist> <varlistentry> <term> @@ -493,7 +490,6 @@ if the specified KeySym is a cursor key. <!-- .sM --> <para>IsFunctionKey(<emphasis remap='I'>keysym</emphasis>)</para> <!-- .FN --> -<!-- .ds Fn tested --> <variablelist> <varlistentry> <term> @@ -520,7 +516,6 @@ if the specified KeySym is a function key. <!-- .sM --> <para>IsKeypadKey(<emphasis remap='I'>keysym</emphasis>)</para> <!-- .FN --> -<!-- .ds Fn tested --> <variablelist> <varlistentry> <term> @@ -528,7 +523,7 @@ if the specified KeySym is a function key. </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be tested. </para> </listitem> </varlistentry> @@ -554,7 +549,7 @@ if the specified KeySym is a standard keypad key. </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be tested. </para> </listitem> </varlistentry> @@ -574,7 +569,6 @@ if the specified KeySym is a vendor-private keypad key. <!-- .sM --> <para>IsMiscFunctionKey(<emphasis remap='I'>keysym</emphasis>)</para> <!-- .FN --> -<!-- .ds Fn tested --> <variablelist> <varlistentry> <term> @@ -582,7 +576,7 @@ if the specified KeySym is a vendor-private keypad key. </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be tested. </para> </listitem> </varlistentry> @@ -815,7 +809,6 @@ use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Fn rebound --> </para> </listitem> </varlistentry> @@ -825,7 +818,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the KeySym that is to be (Fn. +Specifies the KeySym that is to be rebound. </para> </listitem> </varlistentry> @@ -1480,7 +1473,6 @@ To move a region by a specified amount, use <listitem> <para> Specifies the region. -<!-- .ds Dy move --> </para> </listitem> </varlistentry> @@ -1502,7 +1494,7 @@ Specifies the region. <listitem> <para> Specify the x and y coordinates, -which define the amount you want to (Dy the specified region. +which define the amount you want to move the specified region. </para> </listitem> </varlistentry> @@ -1532,7 +1524,6 @@ To reduce a region by a specified amount, use <listitem> <para> Specifies the region. -<!-- .ds Dy shrink --> </para> </listitem> </varlistentry> @@ -1554,7 +1545,7 @@ Specifies the region. <listitem> <para> Specify the x and y coordinates, -which define the amount you want to (Dy the specified region. +which define the amount you want to shrink the specified region. </para> </listitem> </varlistentry> @@ -1996,7 +1987,6 @@ To determine if a specified point resides in a specified region, use <listitem> <para> Specifies the region. -<!-- .ds Xy , which define the point --> </para> </listitem> </varlistentry> @@ -2017,7 +2007,7 @@ Specifies the region. </term> <listitem> <para> -Specify the x and y coordinates(Xy. +Specify the x and y coordinates, which define the point. </para> </listitem> </varlistentry> @@ -2056,7 +2046,6 @@ To determine if a specified rectangle is inside a region, use <listitem> <para> Specifies the region. -<!-- .ds Xy , which define the coordinates of the upper-left corner of the rectangle --> </para> </listitem> </varlistentry> @@ -2077,8 +2066,8 @@ Specifies the region. </term> <listitem> <para> -Specify the x and y coordinates(Xy. -<!-- .ds Wh , which define the rectangle --> +Specify the x and y coordinates, which define the coordinates of the +upper-left corner of the rectangle. </para> </listitem> </varlistentry> @@ -2099,7 +2088,7 @@ Specify the x and y coordinates(Xy. </term> <listitem> <para> -Specify the width and height(Wh. +Specify the width and height, which define the rectangle. </para> </listitem> </varlistentry> @@ -2255,7 +2244,6 @@ Specifies the bytes, which are not necessarily ASCII or null-terminated. <listitem> <para> Specifies the number of bytes to be stored. -<!-- .ds Fn in which you want to store the bytes --> </para> </listitem> </varlistentry> @@ -2265,7 +2253,7 @@ Specifies the number of bytes to be stored. </term> <listitem> <para> -Specifies the buffer (Fn. +Specifies the buffer in which you want to store the bytes. </para> </listitem> </varlistentry> @@ -2371,7 +2359,6 @@ Specifies the connection to the X server. <listitem> <para> Returns the number of bytes in the buffer. -<!-- .ds Fn from which you want the stored data returned --> </para> </listitem> </varlistentry> @@ -2381,7 +2368,7 @@ Returns the number of bytes in the buffer. </term> <listitem> <para> -Specifies the buffer (Fn. +Specifies the buffer from which you want the stored data returned. </para> </listitem> </varlistentry> @@ -3306,7 +3293,6 @@ To read a bitmap from a file and store it in a pixmap, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Dr \ that indicates the screen --> </para> </listitem> </varlistentry> @@ -3316,7 +3302,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the drawable(Dr. +Specifies the drawable that indicates the screen. </para> </listitem> </varlistentry> @@ -3685,7 +3671,6 @@ To create a pixmap and then store bitmap-format data into it, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Dr \ that indicates the screen --> </para> </listitem> </varlistentry> @@ -3695,7 +3680,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the drawable(Dr. +Specifies the drawable that indicates the screen. </para> </listitem> </varlistentry> @@ -3815,7 +3800,6 @@ in a program directly, as opposed to reading it in every time at run time, use <listitem> <para> Specifies the connection to the X server. -<!-- .ds Dr \ that indicates the screen --> </para> </listitem> </varlistentry> @@ -3825,7 +3809,7 @@ Specifies the connection to the X server. </term> <listitem> <para> -Specifies the drawable(Dr. +Specifies the drawable that indicates the screen. </para> </listitem> </varlistentry> diff --git a/libX11/src/xcms/cmsTrig.c b/libX11/src/xcms/cmsTrig.c index a917b78db..fc65d9ba3 100644 --- a/libX11/src/xcms/cmsTrig.c +++ b/libX11/src/xcms/cmsTrig.c @@ -71,7 +71,11 @@ _XcmsModuloF( #define XCMS_SIXTHPI 0.523598775598298820 #define XCMS_RADIANS(d) ((d) * XCMS_PI / 180.0) #define XCMS_DEGREES(r) ((r) * 180.0 / XCMS_PI) +#ifdef __vax__ +#define XCMS_X6_UNDERFLOWS (3.784659e-07) /* X**6 almost underflows*/ +#else #define XCMS_X6_UNDERFLOWS (4.209340e-52) /* X**6 almost underflows */ +#endif #define XCMS_X16_UNDERFLOWS (5.421010e-20) /* X**16 almost underflows*/ #define XCMS_CHAR_BIT 8 #define XCMS_LONG_MAX 0x7FFFFFFF diff --git a/libXmu/src/StrToGrav.c b/libXmu/src/StrToGrav.c index ca8bb5322..e7ad6999b 100644 --- a/libXmu/src/StrToGrav.c +++ b/libXmu/src/StrToGrav.c @@ -106,7 +106,7 @@ Boolean XmuCvtGravityToString(Display *dpy, XrmValue *args, Cardinal *num_args, XrmValue *fromVal, XrmValue *toVal, XtPointer *data) { - static char *buffer; + static const char *buffer; Cardinal size; struct _namepair *np; XtGravity gravity; diff --git a/libxcb/xcb-proto/src/composite.xml b/libxcb/xcb-proto/src/composite.xml index d16b6e746..535a0eecf 100644 --- a/libxcb/xcb-proto/src/composite.xml +++ b/libxcb/xcb-proto/src/composite.xml @@ -26,7 +26,7 @@ authorization from the authors. --> <!-- This file describes version 0.3 of COMPOSITE. --> <xcb header="composite" extension-xname="Composite" extension-name="Composite" - major-version="0" minor-version="3"> + major-version="0" minor-version="4"> <import>xproto</import> <import>xfixes</import> diff --git a/libxcb/xcb-proto/src/glx.xml b/libxcb/xcb-proto/src/glx.xml index 53c926737..2a36daadd 100644 --- a/libxcb/xcb-proto/src/glx.xml +++ b/libxcb/xcb-proto/src/glx.xml @@ -45,8 +45,7 @@ The patch that fixed this server bug in X.org CVS is here: --> <xcb header="glx" extension-xname="GLX" extension-name="Glx" - major-version="1" minor-version="3"> - <!-- target support: 1.3 --> + major-version="1" minor-version="4"> <import>xproto</import> @@ -107,6 +106,18 @@ The patch that fixed this server bug in X.org CVS is here: <pad bytes="4" /> </event> + <event name="BufferSwapComplete" number="1"> + <pad bytes="1" /> + <field type="CARD16" name="event_type" /> + <pad bytes="2" /> + <field type="glx:DRAWABLE" name="drawable" /> + <field type="CARD32" name="ust_hi" /> + <field type="CARD32" name="ust_lo" /> + <field type="CARD32" name="msc_hi" /> + <field type="CARD32" name="msc_lo" /> + <field type="CARD32" name="sbc" /> + </event> + <!-- enums for PbufferClobber event/draw type --> <enum name="PBCET"> <item name="Damaged"> diff --git a/libxcb/xcb-proto/src/randr.xml b/libxcb/xcb-proto/src/randr.xml index 4f0716f7c..1ec3234fb 100644 --- a/libxcb/xcb-proto/src/randr.xml +++ b/libxcb/xcb-proto/src/randr.xml @@ -27,7 +27,7 @@ authorization from the authors. --> <xcb header="randr" extension-xname="RANDR" extension-name="RandR" - major-version="1" minor-version="3"> + major-version="1" minor-version="4"> <import>xproto</import> <import>render</import> @@ -36,12 +36,14 @@ authorization from the authors. <xidtype name="MODE" /> <xidtype name="CRTC" /> <xidtype name="OUTPUT" /> + <xidtype name="PROVIDER" /> <!-- Errors --> - <error name="BadOutput" number="0" /> - <error name="BadCrtc" number="1" /> - <error name="BadMode" number="2" /> + <error name="BadOutput" number="0" /> + <error name="BadCrtc" number="1" /> + <error name="BadMode" number="2" /> + <error name="BadProvider" number="3" /> <!-- Requests --> @@ -113,11 +115,15 @@ authorization from the authors. <!-- opcode 3 is obsolete --> <enum name="NotifyMask" > - <item name="ScreenChange"> <bit>0</bit></item> - <!-- new in 1.2 --> - <item name="CrtcChange"> <bit>1</bit></item> - <item name="OutputChange"> <bit>2</bit></item> - <item name="OutputProperty"><bit>3</bit></item> + <item name="ScreenChange"> <bit>0</bit></item> + <!-- New in version 1.2 --> + <item name="CrtcChange"> <bit>1</bit></item> + <item name="OutputChange"> <bit>2</bit></item> + <item name="OutputProperty"> <bit>3</bit></item> + <!-- New in version 1.4 --> + <item name="ProviderChange"> <bit>4</bit></item> + <item name="ProviderProperty"><bit>5</bit></item> + <item name="ResourceChange"> <bit>6</bit></item> </enum> <request name="SelectInput" opcode="4"> @@ -506,6 +512,14 @@ authorization from the authors. </reply> </request> + <enum name="Transform"> + <!-- Introduced in version 1.3, but not referenced. --> + <item name="Unit"> <bit>0</bit></item> + <item name="ScaleUp"> <bit>1</bit></item> + <item name="ScaleDown"> <bit>2</bit></item> + <item name="Projective"> <bit>3</bit></item> + </enum> + <request name="SetCrtcTransform" opcode="26"> <field type="CRTC" name="crtc" /> <field type="TRANSFORM" name="transform" /> @@ -599,6 +613,163 @@ authorization from the authors. </reply> </request> + <!-- New in version 1.4 --> + + <request name="GetProviders" opcode="32"> + <field type="WINDOW" name="window" /> + <reply> + <pad bytes="1" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="CARD16" name="num_providers" /> + <pad bytes="18" /> + <list type="PROVIDER" name="providers"> + <fieldref>num_providers</fieldref> + </list> + </reply> + </request> + + <enum name="ProviderCapability"> + <item name="SourceOutput"> <bit>0</bit></item> + <item name="SinkOutput"> <bit>1</bit></item> + <item name="SourceOffload"> <bit>2</bit></item> + <item name="SinkOffload"> <bit>3</bit></item> + </enum> + + <request name="GetProviderInfo" opcode="33"> + <field type="PROVIDER" name="provider" /> + <field type="TIMESTAMP" name="config_timestamp" /> + <reply> + <field type="CARD8" name="status" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="CARD32" name="capabilities" mask="ProviderCapability" /> + <field type="CARD16" name="num_crtcs" /> + <field type="CARD16" name="num_outputs" /> + <field type="CARD16" name="num_associated_providers" /> + <field type="CARD16" name="name_len" /> + <pad bytes="8" /> + <list type="CRTC" name="crtcs"> + <fieldref>num_crtcs</fieldref> + </list> + <list type="OUTPUT" name="outputs"> + <fieldref>num_outputs</fieldref> + </list> + <list type="PROVIDER" name="associated_providers"> + <fieldref>num_associated_providers</fieldref> + </list> + <list type="CARD32" name="associated_capability"> + <fieldref>num_associated_providers</fieldref> + </list> + <list type="char" name="name"> + <fieldref>name_len</fieldref> + </list> + <!-- XXX: Prepared for the future. Until xcbgen supports + the align attribute in <pad>, we ignore the + trailing pad bytes here. + <pad align="4" /> + --> + </reply> + </request> + + <request name="SetProviderOffloadSink" opcode="34"> + <field type="PROVIDER" name="provider" /> + <field type="PROVIDER" name="sink_provider" /> + <field type="TIMESTAMP" name="config_timestamp" /> + </request> + + <request name="SetProviderOutputSource" opcode="35"> + <field type="PROVIDER" name="provider" /> + <field type="PROVIDER" name="source_provider" /> + <field type="TIMESTAMP" name="config_timestamp" /> + </request> + + <request name="ListProviderProperties" opcode="36"> + <field type="PROVIDER" name="provider" /> + <reply> + <pad bytes="1" /> + <field type="CARD16" name="num_atoms" /> + <pad bytes="22" /> + <list type="ATOM" name="atoms"> + <fieldref>num_atoms</fieldref> + </list> + </reply> + </request> + + <request name="QueryProviderProperty" opcode="37"> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="property" /> + <reply> + <pad bytes="1" /> + <field type="BOOL" name="pending" /> + <field type="BOOL" name="range" /> + <field type="BOOL" name="immutable" /> + <pad bytes="21" /> + <list type="INT32" name="valid_values"> + <fieldref>length</fieldref> + </list> + </reply> + </request> + + <request name="ConfigureProviderProperty" opcode="38"> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="property" /> + <field type="BOOL" name="pending" /> + <field type="BOOL" name="range" /> + <pad bytes="2" /> + <list type="INT32" name="values" /> + </request> + + <request name="ChangeProviderProperty" opcode="39"> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="property" /> + <field type="ATOM" name="type" /> + <field type="CARD8" name="format" /> + <field type="CARD8" name="mode" /> + <pad bytes="2" /> + <field type="CARD32" name="num_items" /> + <list type="void" name="data"> + <op op="*"> + <fieldref>num_items</fieldref> + <op op="/"> + <fieldref>format</fieldref> + <value>8</value> + </op> + </op> + </list> + </request> + + <request name="DeleteProviderProperty" opcode="40"> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="property" /> + </request> + + <request name="GetProviderProperty" opcode="41"> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="property" /> + <field type="ATOM" name="type" /> <!-- AnyProperty --> + <field type="CARD32" name="long_offset" /> + <field type="CARD32" name="long_length" /> + <field type="BOOL" name="delete" /> + <field type="BOOL" name="pending" /> + <pad bytes="2" /> + <reply> + <pad bytes="1" /> + <field type="CARD8" name="format" /> + <field type="ATOM" name="type" /> <!-- None --> + <field type="CARD32" name="bytes_after" /> + <field type="CARD16" name="num_items" /> + <pad bytes="12" /> + <list type="void" name="data"> + <op op="*"> + <fieldref>num_items</fieldref> + <op op="/"> + <fieldref>format</fieldref> + <value>8</value> + </op> + </op> + </list> + </reply> + </request> + <!-- Events --> <event name="ScreenChangeNotify" number="0"> @@ -619,9 +790,12 @@ authorization from the authors. <!-- subcode --> <enum name="Notify" > - <item name="CrtcChange"> <value>0</value></item> - <item name="OutputChange"> <value>1</value></item> - <item name="OutputProperty"><value>2</value></item> + <item name="CrtcChange"> <value>0</value></item> + <item name="OutputChange"> <value>1</value></item> + <item name="OutputProperty"> <value>2</value></item> + <item name="ProviderChange"> <value>3</value></item> + <item name="ProviderProperty"><value>4</value></item> + <item name="ResourceChange"> <value>5</value></item> </enum> <struct name="CrtcChange"> @@ -658,10 +832,37 @@ authorization from the authors. <pad bytes="11" /> </struct> + <!-- New in version 1.4 --> + + <struct name="ProviderChange"> + <field type="TIMESTAMP" name="timestamp" /> + <field type="WINDOW" name="window" /> + <field type="PROVIDER" name="provider" /> + <pad bytes="16" /> + </struct> + + <struct name="ProviderProperty"> + <field type="WINDOW" name="window" /> + <field type="PROVIDER" name="provider" /> + <field type="ATOM" name="atom" /> + <field type="TIMESTAMP" name="timestamp" /> + <field type="CARD8" name="state" /> + <pad bytes="11" /> + </struct> + + <struct name="ResourceChange"> + <field type="TIMESTAMP" name="timestamp" /> + <field type="WINDOW" name="window" /> + <pad bytes="20" /> + </struct> + <union name="NotifyData"> - <field type="CrtcChange" name="cc" /> - <field type="OutputChange" name="oc" /> - <field type="OutputProperty" name="op" /> + <field type="CrtcChange" name="cc" /> + <field type="OutputChange" name="oc" /> + <field type="OutputProperty" name="op" /> + <field type="ProviderChange" name="pc" /> + <field type="ProviderProperty" name="pp" /> + <field type="ResourceChange" name="rc" /> </union> <event name="Notify" number="1"> diff --git a/libxcb/xcb-proto/src/res.xml b/libxcb/xcb-proto/src/res.xml index 1dd3bd196..17e6f833d 100644 --- a/libxcb/xcb-proto/src/res.xml +++ b/libxcb/xcb-proto/src/res.xml @@ -41,15 +41,20 @@ authorization from the authors. </struct> <!-- v1.2 --> + <enum name="ClientIdMask"> + <item name="ClientXID"> <bit>0</bit> </item> + <item name="LocalClientPID"> <bit>1</bit> </item> + </enum> + <struct name="ClientIdSpec"> <field type="CARD32" name="client" /> - <field type="CARD32" name="mask" /> + <field type="CARD32" name="mask" mask="ClientIdMask" /> </struct> <struct name="ClientIdValue"> <field type="ClientIdSpec" name="spec" /> <field type="CARD32" name="length" /> - <list type="CARD8" name="client_ids"> + <list type="CARD32" name="value"> <fieldref>length</fieldref> </list> </struct> diff --git a/libxcb/xcb-proto/src/xfixes.xml b/libxcb/xcb-proto/src/xfixes.xml index cbc75427b..7b9be170b 100644 --- a/libxcb/xcb-proto/src/xfixes.xml +++ b/libxcb/xcb-proto/src/xfixes.xml @@ -336,7 +336,7 @@ authorization from the authors. <xidtype name="BARRIER" /> - <enum name="DirectionMask"> + <enum name="BarrierDirections"> <item name="PositiveX"><bit>0</bit></item> <item name="PositiveY"><bit>1</bit></item> <item name="NegativeX"><bit>2</bit></item> @@ -350,7 +350,7 @@ authorization from the authors. <field type="CARD16" name="y1" /> <field type="CARD16" name="x2" /> <field type="CARD16" name="y2" /> - <field type="CARD32" name="directions" mask="DirectionMask" /> + <field type="CARD32" name="directions" mask="BarrierDirections" /> <pad bytes="2" /> <field type="CARD16" name="num_devices" /> <list type="CARD16" name="devices"><fieldref>num_devices</fieldref></list> diff --git a/libxcb/xcb-proto/src/xtest.xml b/libxcb/xcb-proto/src/xtest.xml index 7f0b2623c..085d3a3dc 100644 --- a/libxcb/xcb-proto/src/xtest.xml +++ b/libxcb/xcb-proto/src/xtest.xml @@ -27,8 +27,7 @@ authorization from the authors. --> <xcb header="xtest" extension-xname="XTEST" extension-name="Test" - major-version="2" minor-version="1"> - <!-- Conforms to XTEST 2.1 --> + major-version="2" minor-version="2"> <import>xproto</import> diff --git a/mesalib/Android.common.mk b/mesalib/Android.common.mk index 215c640fb..c6ee4e1db 100644 --- a/mesalib/Android.common.mk +++ b/mesalib/Android.common.mk @@ -35,7 +35,7 @@ LOCAL_C_INCLUDES += \ # define ANDROID_VERSION (e.g., 4.0.x => 0x0400) LOCAL_CFLAGS += \ - -DPACKAGE_VERSION=\"9.2-devel\" \ + -DPACKAGE_VERSION=\"9.2.0-devel\" \ -DPACKAGE_BUGREPORT=\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\" \ -DANDROID_VERSION=0x0$(MESA_ANDROID_MAJOR_VERSION)0$(MESA_ANDROID_MINOR_VERSION) diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 0ce94557e..29405a0fd 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -36,7 +36,6 @@ check-local: # Rules for making release tarballs -PACKAGE_VERSION=9.2-devel PACKAGE_DIR = Mesa-$(PACKAGE_VERSION) PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) diff --git a/mesalib/SConstruct b/mesalib/SConstruct index 1807ff835..834e9d58a 100644 --- a/mesalib/SConstruct +++ b/mesalib/SConstruct @@ -70,7 +70,7 @@ if env['gles']: # Environment setup env.Append(CPPDEFINES = [ - ('PACKAGE_VERSION', '\\"9.2-devel\\"'), + ('PACKAGE_VERSION', '\\"9.2.0-devel\\"'), ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'), ]) diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 521331bb4..6832b0d89 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -6,7 +6,7 @@ dnl Tell the user about autoconf.html in the --help output m4_divert_once([HELP_END], [ See docs/autoconf.html for more details on the options for Mesa.]) -AC_INIT([Mesa], [9.2.0], +AC_INIT([Mesa], [9.2.0-devel], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa]) AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_MACRO_DIR([m4]) @@ -1812,6 +1812,7 @@ if test "x$with_gallium_drivers" != x; then if test "x$enable_dri" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast" + HAVE_COMMON_DRI=yes fi if test "x$enable_vdpau" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS vdpau-softpipe" @@ -1983,6 +1984,8 @@ AC_CONFIG_FILES([Makefile src/gallium/auxiliary/pipe-loader/Makefile src/gallium/drivers/Makefile src/gallium/drivers/freedreno/Makefile + src/gallium/drivers/freedreno/a2xx/Makefile + src/gallium/drivers/freedreno/a3xx/Makefile src/gallium/drivers/i915/Makefile src/gallium/drivers/ilo/Makefile src/gallium/drivers/llvmpipe/Makefile diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html index f5eb4d468..5aad0fb1d 100644 --- a/mesalib/docs/devinfo.html +++ b/mesalib/docs/devinfo.html @@ -196,7 +196,6 @@ branch is relevant. <h3>Verify and update version info</h3> <dl> - <dt>Makefile.am</dt> <dt>SConstruct</dt> <dt>Android.common.mk</dt> <dd>PACKAGE_VERSION</dd> diff --git a/mesalib/docs/envvars.html b/mesalib/docs/envvars.html index 389da62e6..67d8e292b 100644 --- a/mesalib/docs/envvars.html +++ b/mesalib/docs/envvars.html @@ -153,10 +153,6 @@ Mesa EGL supports different sets of environment variables. See the rather than stderr. <li>GALLIUM_PRINT_OPTIONS - if non-zero, print all the Gallium environment variables which are used, and their current values. -<li>GALLIUM_NOSSE - if non-zero, do not use SSE runtime code generation for - shader execution -<li>GALLIUM_NOPPC - if non-zero, do not use PPC runtime code generation for - shader execution <li>GALLIUM_DUMP_CPU - if non-zero, print information about the CPU on start-up <li>TGSI_PRINT_SANITY - if set, do extra sanity checking on TGSI shaders and print any errors to stderr. @@ -164,6 +160,9 @@ Mesa EGL supports different sets of environment variables. See the <LI>DRAW_NO_FSE - ??? <li>DRAW_USE_LLVM - if set to zero, the draw module will not use LLVM to execute shaders, vertex fetch, etc. +<li>ST_DEBUG - controls debug output from the Mesa/Gallium state tracker. +Setting to "tgsi", for example, will print all the TGSI shaders. +See src/mesa/state_tracker/st_debug.c for other options. </ul> <h3>Softpipe driver environment variables</h3> @@ -190,6 +189,16 @@ Mesa EGL supports different sets of environment variables. See the cores present. </ul> +<h3>VMware SVGA driver environment variables</h3> +<ul> +<li>SVGA_FORCE_SWTNL - force use of software vertex transformation +<li>SVGA_NO_SWTNL - don't allow software vertex transformation fallbacks +(will often result in incorrect rendering). +<li>SVGA_DEBUG - for dumping shaders, constant buffers, etc. See the code +for details. +<li>See the driver code for other, lesser-used variables. +</ul> + <p> Other Gallium drivers have their own environment variables. These may change diff --git a/mesalib/include/GL/glx.h b/mesalib/include/GL/glx.h index 7c8635cc7..87c31fdcc 100644 --- a/mesalib/include/GL/glx.h +++ b/mesalib/include/GL/glx.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/include/GL/glx_mangle.h b/mesalib/include/GL/glx_mangle.h index 240de495f..fad6c6a47 100644 --- a/mesalib/include/GL/glx_mangle.h +++ b/mesalib/include/GL/glx_mangle.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/include/GL/osmesa.h b/mesalib/include/GL/osmesa.h index 571ef4ada..c36f64981 100644 --- a/mesalib/include/GL/osmesa.h +++ b/mesalib/include/GL/osmesa.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/include/GL/wmesa.h b/mesalib/include/GL/wmesa.h index f5f4f273b..03d2383d3 100644 --- a/mesalib/include/GL/wmesa.h +++ b/mesalib/include/GL/wmesa.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 3.0 * Copyright (C) 1995-1998 Brian Paul * * This library is free software; you can redistribute it and/or diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 658df9782..39a5333fd 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -95,7 +95,7 @@ def createConvenienceLibBuilder(env): # TODO: handle import statements with multiple modules # TODO: handle from import statements -import_re = re.compile(r'^import\s+(\S+)$', re.M) +import_re = re.compile(r'^\s*import\s+(\S+)\s*$', re.M) def python_scan(node, env, path): # http://www.scons.org/doc/0.98.5/HTML/scons-user/c2781.html#AEN2789 @@ -113,6 +113,7 @@ def python_scan(node, env, path): if os.path.exists(file): results.append(env.File(file)) break + #print node, map(str, results) return results python_scanner = SCons.Scanner.Scanner(function = python_scan, skeys = ['.py']) diff --git a/mesalib/src/gallium/auxiliary/hud/hud_context.c b/mesalib/src/gallium/auxiliary/hud/hud_context.c index de032b6ba..cbd00a961 100644 --- a/mesalib/src/gallium/auxiliary/hud/hud_context.c +++ b/mesalib/src/gallium/auxiliary/hud/hud_context.c @@ -959,7 +959,8 @@ hud_create(struct pipe_context *pipe, struct cso_context *cso) hud->fs_color = util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_COLOR, - TGSI_INTERPOLATE_CONSTANT); + TGSI_INTERPOLATE_CONSTANT, + TRUE); { /* Read a texture and do .xxxx swizzling. */ diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index 8c871fdf9..e9ac170f7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -67,9 +67,9 @@ struct blitter_context_priv void *vs_pos_only; /**< Vertex shader which passes pos to the output.*/ /* Fragment shaders. */ - /* The shader at index i outputs color to color buffers 0,1,...,i-1. */ - void *fs_col[PIPE_MAX_COLOR_BUFS+1]; - void *fs_col_int[PIPE_MAX_COLOR_BUFS+1]; + void *fs_empty; + void *fs_write_one_cbuf; + void *fs_write_all_cbufs; /* FS which outputs a color from a texture, where the index is PIPE_TEXTURE_* to be sampled. */ @@ -98,8 +98,6 @@ struct blitter_context_priv /* Vertex elements states. */ void *velem_state; - void *velem_uint_state; - void *velem_sint_state; void *velem_state_readbuf[4]; /**< X, XY, XYZ, XYZW */ /* Sampler state. */ @@ -119,7 +117,6 @@ struct blitter_context_priv unsigned dst_height; boolean has_geometry_shader; - boolean vertex_has_integers; boolean has_stream_out; boolean has_stencil_export; boolean has_texture_multisample; @@ -171,9 +168,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe) ctx->has_geometry_shader = pipe->screen->get_shader_param(pipe->screen, PIPE_SHADER_GEOMETRY, PIPE_SHADER_CAP_MAX_INSTRUCTIONS) > 0; - ctx->vertex_has_integers = - pipe->screen->get_shader_param(pipe->screen, PIPE_SHADER_VERTEX, - PIPE_SHADER_CAP_INTEGERS); ctx->has_stream_out = pipe->screen->get_param(pipe->screen, PIPE_CAP_MAX_STREAM_OUTPUT_BUFFERS) != 0; @@ -265,26 +259,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe) } ctx->velem_state = pipe->create_vertex_elements_state(pipe, 2, &velem[0]); - if (ctx->vertex_has_integers) { - memset(&velem[0], 0, sizeof(velem[0]) * 2); - velem[0].src_offset = 0; - velem[0].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT; - velem[0].vertex_buffer_index = ctx->base.vb_slot; - velem[1].src_offset = 4 * sizeof(float); - velem[1].src_format = PIPE_FORMAT_R32G32B32A32_SINT; - velem[1].vertex_buffer_index = ctx->base.vb_slot; - ctx->velem_sint_state = pipe->create_vertex_elements_state(pipe, 2, &velem[0]); - - memset(&velem[0], 0, sizeof(velem[0]) * 2); - velem[0].src_offset = 0; - velem[0].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT; - velem[0].vertex_buffer_index = ctx->base.vb_slot; - velem[1].src_offset = 4 * sizeof(float); - velem[1].src_format = PIPE_FORMAT_R32G32B32A32_UINT; - velem[1].vertex_buffer_index = ctx->base.vb_slot; - ctx->velem_uint_state = pipe->create_vertex_elements_state(pipe, 2, &velem[0]); - } - if (ctx->has_stream_out) { static enum pipe_format formats[4] = { PIPE_FORMAT_R32_UINT, @@ -301,7 +275,16 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe) } } - /* fragment shaders are created on-demand */ + /* Fragment shaders are created on-demand, except these. + * The interpolation must be constant for integer texture clearing to work. + */ + ctx->fs_empty = util_make_empty_fragment_shader(pipe); + ctx->fs_write_one_cbuf = + util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC, + TGSI_INTERPOLATE_CONSTANT, FALSE); + ctx->fs_write_all_cbufs = + util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC, + TGSI_INTERPOLATE_CONSTANT, TRUE); /* vertex shaders */ { @@ -359,10 +342,6 @@ void util_blitter_destroy(struct blitter_context *blitter) if (ctx->vs_pos_only) pipe->delete_vs_state(pipe, ctx->vs_pos_only); pipe->delete_vertex_elements_state(pipe, ctx->velem_state); - if (ctx->vertex_has_integers) { - pipe->delete_vertex_elements_state(pipe, ctx->velem_sint_state); - pipe->delete_vertex_elements_state(pipe, ctx->velem_uint_state); - } for (i = 0; i < 4; i++) { if (ctx->velem_state_readbuf[i]) { pipe->delete_vertex_elements_state(pipe, ctx->velem_state_readbuf[i]); @@ -379,13 +358,9 @@ void util_blitter_destroy(struct blitter_context *blitter) if (ctx->fs_texfetch_stencil[i]) ctx->delete_fs_state(pipe, ctx->fs_texfetch_stencil[i]); } - - for (i = 0; i <= PIPE_MAX_COLOR_BUFS; i++) { - if (ctx->fs_col[i]) - ctx->delete_fs_state(pipe, ctx->fs_col[i]); - if (ctx->fs_col_int[i]) - ctx->delete_fs_state(pipe, ctx->fs_col_int[i]); - } + ctx->delete_fs_state(pipe, ctx->fs_empty); + ctx->delete_fs_state(pipe, ctx->fs_write_one_cbuf); + ctx->delete_fs_state(pipe, ctx->fs_write_all_cbufs); pipe->delete_sampler_state(pipe, ctx->sampler_state_rect_linear); pipe->delete_sampler_state(pipe, ctx->sampler_state_rect); @@ -732,30 +707,6 @@ static void blitter_set_dst_dimensions(struct blitter_context_priv *ctx, ctx->dst_height = height; } -static void *blitter_get_fs_col(struct blitter_context_priv *ctx, - unsigned num_cbufs, boolean int_format) -{ - struct pipe_context *pipe = ctx->base.pipe; - - assert(num_cbufs <= PIPE_MAX_COLOR_BUFS); - - if (int_format) { - if (!ctx->fs_col_int[num_cbufs]) - ctx->fs_col_int[num_cbufs] = - util_make_fragment_cloneinput_shader(pipe, num_cbufs, - TGSI_SEMANTIC_GENERIC, - TGSI_INTERPOLATE_CONSTANT); - return ctx->fs_col_int[num_cbufs]; - } else { - if (!ctx->fs_col[num_cbufs]) - ctx->fs_col[num_cbufs] = - util_make_fragment_cloneinput_shader(pipe, num_cbufs, - TGSI_SEMANTIC_GENERIC, - TGSI_INTERPOLATE_LINEAR); - return ctx->fs_col[num_cbufs]; - } -} - static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx, enum pipe_texture_target target, unsigned nr_samples) @@ -910,22 +861,15 @@ void util_blitter_cache_all_shaders(struct blitter_context *blitter) { struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; struct pipe_screen *screen = blitter->pipe->screen; - unsigned num_cbufs, i, target, max_samples; + unsigned i, target, max_samples; boolean has_arraytex, has_cubearraytex; - num_cbufs = MAX2(screen->get_param(screen, - PIPE_CAP_MAX_RENDER_TARGETS), 1); max_samples = ctx->has_texture_multisample ? 2 : 1; has_arraytex = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS) != 0; has_cubearraytex = screen->get_param(screen, PIPE_CAP_CUBE_MAP_ARRAY) != 0; - for (i = 0; i < num_cbufs; i++) { - blitter_get_fs_col(ctx, i, FALSE); - blitter_get_fs_col(ctx, i, TRUE); - } - /* It only matters if i <= 1 or > 1. */ for (i = 1; i <= max_samples; i++) { for (target = PIPE_TEXTURE_1D; target < PIPE_MAX_TEXTURE_TYPES; target++) { @@ -1007,9 +951,7 @@ void util_blitter_draw_rectangle(struct blitter_context *blitter, static void util_blitter_clear_custom(struct blitter_context *blitter, unsigned width, unsigned height, - unsigned num_cbufs, unsigned clear_buffers, - enum pipe_format cbuf_format, const union pipe_color_union *color, double depth, unsigned stencil, void *custom_blend, void *custom_dsa) @@ -1017,8 +959,6 @@ static void util_blitter_clear_custom(struct blitter_context *blitter, struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; struct pipe_context *pipe = ctx->base.pipe; struct pipe_stencil_ref sr = { { 0 } }; - boolean int_format = util_format_is_pure_integer(cbuf_format); - assert(num_cbufs <= PIPE_MAX_COLOR_BUFS); blitter_set_running_flag(ctx); blitter_check_saved_vertex_states(ctx); @@ -1049,14 +989,8 @@ static void util_blitter_clear_custom(struct blitter_context *blitter, sr.ref_value[0] = stencil & 0xff; pipe->set_stencil_ref(pipe, &sr); - if (util_format_is_pure_sint(cbuf_format)) { - pipe->bind_vertex_elements_state(pipe, ctx->velem_sint_state); - } else if (util_format_is_pure_uint(cbuf_format)) { - pipe->bind_vertex_elements_state(pipe, ctx->velem_uint_state); - } else { - pipe->bind_vertex_elements_state(pipe, ctx->velem_state); - } - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, num_cbufs, int_format)); + pipe->bind_vertex_elements_state(pipe, ctx->velem_state); + ctx->bind_fs_state(pipe, ctx->fs_write_all_cbufs); pipe->set_sample_mask(pipe, ~0); blitter_set_common_draw_rect_state(ctx, FALSE); @@ -1072,14 +1006,12 @@ static void util_blitter_clear_custom(struct blitter_context *blitter, void util_blitter_clear(struct blitter_context *blitter, unsigned width, unsigned height, - unsigned num_cbufs, unsigned clear_buffers, - enum pipe_format cbuf_format, const union pipe_color_union *color, double depth, unsigned stencil) { - util_blitter_clear_custom(blitter, width, height, num_cbufs, - clear_buffers, cbuf_format, color, depth, stencil, + util_blitter_clear_custom(blitter, width, height, + clear_buffers, color, depth, stencil, NULL, NULL); } @@ -1088,8 +1020,8 @@ void util_blitter_custom_clear_depth(struct blitter_context *blitter, double depth, void *custom_dsa) { static const union pipe_color_union color; - util_blitter_clear_custom(blitter, width, height, 0, - 0, PIPE_FORMAT_NONE, &color, depth, 0, NULL, custom_dsa); + util_blitter_clear_custom(blitter, width, height, 0, &color, depth, 0, + NULL, custom_dsa); } void util_blitter_default_dst_texture(struct pipe_surface *dst_templ, @@ -1559,7 +1491,7 @@ void util_blitter_clear_render_target(struct blitter_context *blitter, /* bind states */ pipe->bind_blend_state(pipe, ctx->blend[PIPE_MASK_RGBA]); pipe->bind_depth_stencil_alpha_state(pipe, ctx->dsa_keep_depth_stencil); - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 1, FALSE)); + ctx->bind_fs_state(pipe, ctx->fs_write_one_cbuf); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); /* set a framebuffer state */ @@ -1627,7 +1559,7 @@ void util_blitter_clear_depth_stencil(struct blitter_context *blitter, /* hmm that should be illegal probably, or make it a no-op somewhere */ pipe->bind_depth_stencil_alpha_state(pipe, ctx->dsa_keep_depth_stencil); - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 0, FALSE)); + ctx->bind_fs_state(pipe, ctx->fs_empty); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); /* set a framebuffer state */ @@ -1678,7 +1610,7 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter, pipe->bind_blend_state(pipe, cbsurf ? ctx->blend[PIPE_MASK_RGBA] : ctx->blend[0]); pipe->bind_depth_stencil_alpha_state(pipe, dsa_stage); - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 0, FALSE)); + ctx->bind_fs_state(pipe, ctx->fs_empty); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); /* set a framebuffer state */ @@ -1855,7 +1787,7 @@ void util_blitter_custom_resolve_color(struct blitter_context *blitter, pipe->bind_blend_state(pipe, custom_blend); pipe->bind_depth_stencil_alpha_state(pipe, ctx->dsa_keep_depth_stencil); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 1, FALSE)); + ctx->bind_fs_state(pipe, ctx->fs_write_one_cbuf); pipe->set_sample_mask(pipe, sample_mask); memset(&surf_tmpl, 0, sizeof(surf_tmpl)); @@ -1918,7 +1850,7 @@ void util_blitter_custom_color(struct blitter_context *blitter, pipe->bind_blend_state(pipe, custom_blend ? custom_blend : ctx->blend[PIPE_MASK_RGBA]); pipe->bind_depth_stencil_alpha_state(pipe, ctx->dsa_keep_depth_stencil); - ctx->bind_fs_state(pipe, blitter_get_fs_col(ctx, 1, FALSE)); + ctx->bind_fs_state(pipe, ctx->fs_write_one_cbuf); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); pipe->set_sample_mask(pipe, (1ull << MAX2(1, dstsurf->texture->nr_samples)) - 1); diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.h b/mesalib/src/gallium/auxiliary/util/u_blitter.h index 19015844e..e52d5acc9 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.h +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.h @@ -183,9 +183,7 @@ void util_blitter_draw_rectangle(struct blitter_context *blitter, */ void util_blitter_clear(struct blitter_context *blitter, unsigned width, unsigned height, - unsigned num_cbufs, unsigned clear_buffers, - enum pipe_format cbuf_format, const union pipe_color_union *color, double depth, unsigned stencil); diff --git a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c index 7e6df9df1..763b5cc22 100644 --- a/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c +++ b/mesalib/src/gallium/auxiliary/util/u_cpu_detect.c @@ -250,6 +250,11 @@ util_cpu_detect(void) util_cpu_caps.nr_cpus = 1; #endif + /* Make the fallback cacheline size nonzero so that it can be + * safely passed to align(). + */ + util_cpu_caps.cacheline = sizeof(void *); + #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) if (has_cpuid()) { uint32_t regs[4]; diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h index e4b9c365c..4cace6ad1 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.h +++ b/mesalib/src/gallium/auxiliary/util/u_format.h @@ -31,6 +31,7 @@ #include "pipe/p_format.h" +#include "pipe/p_defines.h" #include "util/u_debug.h" union pipe_color_union; @@ -520,6 +521,33 @@ util_format_is_depth_and_stencil(enum pipe_format format) util_format_has_stencil(desc); } +/** + * Return whether this is an RGBA, Z, S, or combined ZS format. + * Useful for initializing pipe_blit_info::mask. + */ +static INLINE unsigned +util_format_get_mask(enum pipe_format format) +{ + const struct util_format_description *desc = + util_format_description(format); + + if (!desc) + return 0; + + if (util_format_has_depth(desc)) { + if (util_format_has_stencil(desc)) { + return PIPE_MASK_ZS; + } else { + return PIPE_MASK_Z; + } + } else { + if (util_format_has_stencil(desc)) { + return PIPE_MASK_S; + } else { + return PIPE_MASK_RGBA; + } + } +} /** * Give the RGBA colormask of the channels that can be represented in this diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h index 607fbecb0..64d16cbe7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_math.h +++ b/mesalib/src/gallium/auxiliary/util/u_math.h @@ -540,14 +540,13 @@ ubyte_to_float(ubyte ub) static INLINE ubyte float_to_ubyte(float f) { - const int ieee_0996 = 0x3f7f0000; /* 0.996 or so */ union fi tmp; tmp.f = f; if (tmp.i < 0) { return (ubyte) 0; } - else if (tmp.i >= ieee_0996) { + else if (tmp.i >= 0x3f800000 /* 1.0f */) { return (ubyte) 255; } else { diff --git a/mesalib/src/gallium/auxiliary/util/u_resource.h b/mesalib/src/gallium/auxiliary/util/u_resource.h index 977e0136b..a5e091fd6 100644 --- a/mesalib/src/gallium/auxiliary/util/u_resource.h +++ b/mesalib/src/gallium/auxiliary/util/u_resource.h @@ -26,9 +26,27 @@ #ifndef U_RESOURCE_H #define U_RESOURCE_H -struct pipe_resource; +#include "pipe/p_state.h" unsigned util_resource_size(const struct pipe_resource *res); +/** + * Return true if the resource is an array texture. + * + * Note that this function returns true for single-layered array textures. + */ +static INLINE boolean +util_resource_is_array_texture(const struct pipe_resource *res) +{ + switch (res->target) { + case PIPE_TEXTURE_1D_ARRAY: + case PIPE_TEXTURE_2D_ARRAY: + case PIPE_TEXTURE_CUBE_ARRAY: + return TRUE; + default: + return FALSE; + } +} + #endif diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_list.h b/mesalib/src/gallium/auxiliary/util/u_simple_list.h index 7a47c1a78..3f7def5fc 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_list.h +++ b/mesalib/src/gallium/auxiliary/util/u_simple_list.h @@ -11,7 +11,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c index c53c2d024..c93d75469 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c @@ -322,11 +322,12 @@ util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, void * util_make_fragment_passthrough_shader(struct pipe_context *pipe, int input_semantic, - int input_interpolate) + int input_interpolate, + boolean write_all_cbufs) { static const char shader_templ[] = "FRAG\n" - "PROPERTY FS_COLOR0_WRITES_ALL_CBUFS 1\n" + "%s" "DCL IN[0], %s[0], %s\n" "DCL OUT[0], COLOR[0]\n" @@ -337,7 +338,9 @@ util_make_fragment_passthrough_shader(struct pipe_context *pipe, struct tgsi_token tokens[1000]; struct pipe_shader_state state = {tokens}; - sprintf(text, shader_templ, tgsi_semantic_names[input_semantic], + sprintf(text, shader_templ, + write_all_cbufs ? "PROPERTY FS_COLOR0_WRITES_ALL_CBUFS 1\n" : "", + tgsi_semantic_names[input_semantic], tgsi_interpolate_names[input_interpolate]); if (!tgsi_text_translate(text, tokens, Elements(tokens))) { @@ -352,6 +355,18 @@ util_make_fragment_passthrough_shader(struct pipe_context *pipe, } +void * +util_make_empty_fragment_shader(struct pipe_context *pipe) +{ + struct ureg_program *ureg = ureg_create(TGSI_PROCESSOR_FRAGMENT); + if (ureg == NULL) + return NULL; + + ureg_END(ureg); + return ureg_create_shader_and_destroy(ureg, pipe); +} + + /** * Make a fragment shader that copies the input color to N output colors. */ diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h index 22b9cee4d..016664d1b 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h +++ b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h @@ -89,7 +89,12 @@ util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, extern void * util_make_fragment_passthrough_shader(struct pipe_context *pipe, int input_semantic, - int input_interpolate); + int input_interpolate, + boolean write_all_cbufs); + + +extern void * +util_make_empty_fragment_shader(struct pipe_context *pipe); extern void * diff --git a/mesalib/src/gallium/auxiliary/util/u_surface.c b/mesalib/src/gallium/auxiliary/util/u_surface.c index 5c3a655d6..07997d2ad 100644 --- a/mesalib/src/gallium/auxiliary/util/u_surface.c +++ b/mesalib/src/gallium/auxiliary/util/u_surface.c @@ -214,6 +214,30 @@ util_fill_rect(ubyte * dst, } +void +util_fill_box(ubyte * dst, + enum pipe_format format, + unsigned stride, + unsigned layer_stride, + unsigned x, + unsigned y, + unsigned z, + unsigned width, + unsigned height, + unsigned depth, + union util_color *uc) +{ + unsigned layer; + dst += z * layer_stride; + for (layer = z; layer < depth; layer++) { + util_fill_rect(dst, format, + stride, + x, y, width, height, uc); + dst += layer_stride; + } +} + + /** * Fallback function for pipe->resource_copy_region(). * Note: (X,Y)=(0,0) is always the upper-left corner. @@ -307,6 +331,7 @@ no_src_map: * cpp > 4 looks like a gross hack at best... * Plus can't use these transfer fallbacks when clearing * multisampled surfaces for instance. + * Clears all bound layers. */ void util_clear_render_target(struct pipe_context *pipe, @@ -316,8 +341,9 @@ util_clear_render_target(struct pipe_context *pipe, unsigned width, unsigned height) { struct pipe_transfer *dst_trans; - void *dst_map; + ubyte *dst_map; union util_color uc; + unsigned max_layer; assert(dst->texture); if (!dst->texture) @@ -332,6 +358,7 @@ util_clear_render_target(struct pipe_context *pipe, unsigned pixstride = util_format_get_blocksize(dst->format); dx = (dst->u.buf.first_element + dstx) * pixstride; w = width * pixstride; + max_layer = 0; dst_map = pipe_transfer_map(pipe, dst->texture, 0, 0, @@ -340,14 +367,13 @@ util_clear_render_target(struct pipe_context *pipe, &dst_trans); } else { - /* XXX: should handle multiple layers */ - dst_map = pipe_transfer_map(pipe, - dst->texture, - dst->u.tex.level, - dst->u.tex.first_layer, - PIPE_TRANSFER_WRITE, - dstx, dsty, width, height, &dst_trans); - + max_layer = dst->u.tex.last_layer - dst->u.tex.first_layer; + dst_map = pipe_transfer_map_3d(pipe, + dst->texture, + dst->u.tex.level, + PIPE_TRANSFER_WRITE, + dstx, dsty, dst->u.tex.first_layer, + width, height, max_layer + 1, &dst_trans); } assert(dst_map); @@ -373,9 +399,10 @@ util_clear_render_target(struct pipe_context *pipe, else { util_pack_color(color->f, dst->format, &uc); } - util_fill_rect(dst_map, dst->format, - dst_trans->stride, - 0, 0, width, height, &uc); + + util_fill_box(dst_map, dst->format, + dst_trans->stride, dst_trans->layer_stride, + 0, 0, 0, width, height, max_layer + 1, &uc); pipe->transfer_unmap(pipe, dst_trans); } @@ -386,6 +413,7 @@ util_clear_render_target(struct pipe_context *pipe, * sw fallback doesn't look terribly useful here. * Plus can't use these transfer fallbacks when clearing * multisampled surfaces for instance. + * Clears all bound layers. */ void util_clear_depth_stencil(struct pipe_context *pipe, @@ -400,6 +428,7 @@ util_clear_depth_stencil(struct pipe_context *pipe, struct pipe_transfer *dst_trans; ubyte *dst_map; boolean need_rmw = FALSE; + unsigned max_layer, layer; if ((clear_flags & PIPE_CLEAR_DEPTHSTENCIL) && ((clear_flags & PIPE_CLEAR_DEPTHSTENCIL) != PIPE_CLEAR_DEPTHSTENCIL) && @@ -409,102 +438,109 @@ util_clear_depth_stencil(struct pipe_context *pipe, assert(dst->texture); if (!dst->texture) return; - dst_map = pipe_transfer_map(pipe, - dst->texture, - dst->u.tex.level, - dst->u.tex.first_layer, - (need_rmw ? PIPE_TRANSFER_READ_WRITE : - PIPE_TRANSFER_WRITE), - dstx, dsty, width, height, &dst_trans); + + max_layer = dst->u.tex.last_layer - dst->u.tex.first_layer; + dst_map = pipe_transfer_map_3d(pipe, + dst->texture, + dst->u.tex.level, + (need_rmw ? PIPE_TRANSFER_READ_WRITE : + PIPE_TRANSFER_WRITE), + dstx, dsty, dst->u.tex.first_layer, + width, height, max_layer + 1, &dst_trans); assert(dst_map); if (dst_map) { unsigned dst_stride = dst_trans->stride; - uint64_t zstencil = util_pack64_z_stencil(format, - depth, stencil); + uint64_t zstencil = util_pack64_z_stencil(format, depth, stencil); + ubyte *dst_layer = dst_map; unsigned i, j; assert(dst_trans->stride > 0); - switch (util_format_get_blocksize(format)) { - case 1: - assert(format == PIPE_FORMAT_S8_UINT); - if(dst_stride == width) - memset(dst_map, (uint8_t) zstencil, height * width); - else { - for (i = 0; i < height; i++) { - memset(dst_map, (uint8_t) zstencil, width); - dst_map += dst_stride; - } - } - break; - case 2: - assert(format == PIPE_FORMAT_Z16_UNORM); - for (i = 0; i < height; i++) { - uint16_t *row = (uint16_t *)dst_map; - for (j = 0; j < width; j++) - *row++ = (uint16_t) zstencil; - dst_map += dst_stride; + for (layer = 0; layer <= max_layer; layer++) { + dst_map = dst_layer; + + switch (util_format_get_blocksize(format)) { + case 1: + assert(format == PIPE_FORMAT_S8_UINT); + if(dst_stride == width) + memset(dst_map, (uint8_t) zstencil, height * width); + else { + for (i = 0; i < height; i++) { + memset(dst_map, (uint8_t) zstencil, width); + dst_map += dst_stride; + } } - break; - case 4: - if (!need_rmw) { + break; + case 2: + assert(format == PIPE_FORMAT_Z16_UNORM); for (i = 0; i < height; i++) { - uint32_t *row = (uint32_t *)dst_map; + uint16_t *row = (uint16_t *)dst_map; for (j = 0; j < width; j++) - *row++ = (uint32_t) zstencil; + *row++ = (uint16_t) zstencil; dst_map += dst_stride; + } + break; + case 4: + if (!need_rmw) { + for (i = 0; i < height; i++) { + uint32_t *row = (uint32_t *)dst_map; + for (j = 0; j < width; j++) + *row++ = (uint32_t) zstencil; + dst_map += dst_stride; + } } - } - else { - uint32_t dst_mask; - if (format == PIPE_FORMAT_Z24_UNORM_S8_UINT) - dst_mask = 0x00ffffff; else { - assert(format == PIPE_FORMAT_S8_UINT_Z24_UNORM); - dst_mask = 0xffffff00; - } - if (clear_flags & PIPE_CLEAR_DEPTH) - dst_mask = ~dst_mask; - for (i = 0; i < height; i++) { - uint32_t *row = (uint32_t *)dst_map; - for (j = 0; j < width; j++) { - uint32_t tmp = *row & dst_mask; - *row++ = tmp | ((uint32_t) zstencil & ~dst_mask); + uint32_t dst_mask; + if (format == PIPE_FORMAT_Z24_UNORM_S8_UINT) + dst_mask = 0x00ffffff; + else { + assert(format == PIPE_FORMAT_S8_UINT_Z24_UNORM); + dst_mask = 0xffffff00; + } + if (clear_flags & PIPE_CLEAR_DEPTH) + dst_mask = ~dst_mask; + for (i = 0; i < height; i++) { + uint32_t *row = (uint32_t *)dst_map; + for (j = 0; j < width; j++) { + uint32_t tmp = *row & dst_mask; + *row++ = tmp | ((uint32_t) zstencil & ~dst_mask); + } + dst_map += dst_stride; } - dst_map += dst_stride; } - } - break; - case 8: - if (!need_rmw) { - for (i = 0; i < height; i++) { - uint64_t *row = (uint64_t *)dst_map; - for (j = 0; j < width; j++) - *row++ = zstencil; - dst_map += dst_stride; + break; + case 8: + if (!need_rmw) { + for (i = 0; i < height; i++) { + uint64_t *row = (uint64_t *)dst_map; + for (j = 0; j < width; j++) + *row++ = zstencil; + dst_map += dst_stride; + } } - } - else { - uint64_t src_mask; - - if (clear_flags & PIPE_CLEAR_DEPTH) - src_mask = 0x00000000ffffffffull; - else - src_mask = 0x000000ff00000000ull; - - for (i = 0; i < height; i++) { - uint64_t *row = (uint64_t *)dst_map; - for (j = 0; j < width; j++) { - uint64_t tmp = *row & ~src_mask; - *row++ = tmp | (zstencil & src_mask); + else { + uint64_t src_mask; + + if (clear_flags & PIPE_CLEAR_DEPTH) + src_mask = 0x00000000ffffffffull; + else + src_mask = 0x000000ff00000000ull; + + for (i = 0; i < height; i++) { + uint64_t *row = (uint64_t *)dst_map; + for (j = 0; j < width; j++) { + uint64_t tmp = *row & ~src_mask; + *row++ = tmp | (zstencil & src_mask); + } + dst_map += dst_stride; } - dst_map += dst_stride; } + break; + default: + assert(0); + break; } - break; - default: - assert(0); - break; + dst_layer += dst_trans->layer_stride; } pipe->transfer_unmap(pipe, dst_trans); @@ -512,30 +548,6 @@ util_clear_depth_stencil(struct pipe_context *pipe, } -/* Return whether this is an RGBA, Z, S, or combined ZS format. - */ -static unsigned -get_format_mask(enum pipe_format format) -{ - const struct util_format_description *desc = util_format_description(format); - - assert(desc); - - if (util_format_has_depth(desc)) { - if (util_format_has_stencil(desc)) { - return PIPE_MASK_ZS; - } else { - return PIPE_MASK_Z; - } - } else { - if (util_format_has_stencil(desc)) { - return PIPE_MASK_S; - } else { - return PIPE_MASK_RGBA; - } - } -} - /* Return if the box is totally inside the resource. */ static boolean @@ -618,7 +630,7 @@ boolean util_try_blit_via_copy_region(struct pipe_context *ctx, const struct pipe_blit_info *blit) { - unsigned mask = get_format_mask(blit->dst.format); + unsigned mask = util_format_get_mask(blit->dst.format); /* No format conversions. */ if (blit->src.resource->format != blit->src.format || diff --git a/mesalib/src/gallium/auxiliary/util/u_surface.h b/mesalib/src/gallium/auxiliary/util/u_surface.h index d6184acbd..bfd8f40d1 100644 --- a/mesalib/src/gallium/auxiliary/util/u_surface.h +++ b/mesalib/src/gallium/auxiliary/util/u_surface.h @@ -65,6 +65,13 @@ util_fill_rect(ubyte * dst, enum pipe_format format, unsigned dst_stride, unsigned dst_x, unsigned dst_y, unsigned width, unsigned height, union util_color *uc); +extern void +util_fill_box(ubyte * dst, enum pipe_format format, + unsigned stride, unsigned layer_stride, + unsigned x, unsigned y, unsigned z, + unsigned width, unsigned height, unsigned depth, + union util_color *uc); + extern void util_resource_copy_region(struct pipe_context *pipe, diff --git a/mesalib/src/gallium/auxiliary/util/u_transfer.c b/mesalib/src/gallium/auxiliary/util/u_transfer.c index 56e059bfd..7804f2a82 100644 --- a/mesalib/src/gallium/auxiliary/util/u_transfer.c +++ b/mesalib/src/gallium/auxiliary/util/u_transfer.c @@ -25,6 +25,7 @@ void u_default_transfer_inline_write( struct pipe_context *pipe, usage |= PIPE_TRANSFER_WRITE; /* transfer_inline_write implicitly discards the rewritten buffer range */ + /* XXX this looks very broken for non-buffer resources having more than one dim. */ if (box->x == 0 && box->width == resource->width0) { usage |= PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE; } else { diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf.c b/mesalib/src/gallium/auxiliary/util/u_vbuf.c index 244b04d2a..5936f74a0 100644 --- a/mesalib/src/gallium/auxiliary/util/u_vbuf.c +++ b/mesalib/src/gallium/auxiliary/util/u_vbuf.c @@ -307,6 +307,9 @@ void u_vbuf_destroy(struct u_vbuf *mgr) unsigned num_vb = screen->get_shader_param(screen, PIPE_SHADER_VERTEX, PIPE_SHADER_CAP_MAX_INPUTS); + mgr->pipe->set_index_buffer(mgr->pipe, NULL); + pipe_resource_reference(&mgr->index_buffer.buffer, NULL); + mgr->pipe->set_vertex_buffers(mgr->pipe, 0, num_vb, NULL); for (i = 0; i < PIPE_MAX_ATTRIBS; i++) { diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp index e918adeef..4b5f04980 100644 --- a/mesalib/src/glsl/ast_to_hir.cpp +++ b/mesalib/src/glsl/ast_to_hir.cpp @@ -3358,7 +3358,7 @@ ast_jump_statement::hir(exec_list *instructions, assert(state->current_function); if (opt_return_value) { - ir_rvalue *const ret = opt_return_value->hir(instructions, state); + ir_rvalue *ret = opt_return_value->hir(instructions, state); /* The value of the return type can be NULL if the shader says * 'return foo();' and foo() is a function that returns void. @@ -3370,17 +3370,46 @@ ast_jump_statement::hir(exec_list *instructions, const glsl_type *const ret_type = (ret == NULL) ? glsl_type::void_type : ret->type; - /* Implicit conversions are not allowed for return values. */ - if (state->current_function->return_type != ret_type) { + /* Implicit conversions are not allowed for return values prior to + * ARB_shading_language_420pack. + */ + if (state->current_function->return_type != ret_type) { YYLTYPE loc = this->get_location(); - _mesa_glsl_error(& loc, state, - "`return' with wrong type %s, in function `%s' " - "returning %s", - ret_type->name, - state->current_function->function_name(), - state->current_function->return_type->name); - } + if (state->ARB_shading_language_420pack_enable) { + if (!apply_implicit_conversion(state->current_function->return_type, + ret, state)) { + _mesa_glsl_error(& loc, state, + "Could not implicitly convert return value " + "to %s, in function `%s'", + state->current_function->return_type->name, + state->current_function->function_name()); + } + } else { + _mesa_glsl_error(& loc, state, + "`return' with wrong type %s, in function `%s' " + "returning %s", + ret_type->name, + state->current_function->function_name(), + state->current_function->return_type->name); + } + } else if (state->current_function->return_type->base_type == + GLSL_TYPE_VOID) { + YYLTYPE loc = this->get_location(); + + /* The ARB_shading_language_420pack, GLSL ES 3.0, and GLSL 4.20 + * specs add a clarification: + * + * "A void function can only use return without a return argument, even if + * the return argument has void type. Return statements only accept values: + * + * void func1() { } + * void func2() { return func1(); } // illegal return statement" + */ + _mesa_glsl_error(& loc, state, + "void functions can only use `return' without a " + "return argument"); + } inst = new(ctx) ir_return(ret); } else { diff --git a/mesalib/src/glsl/builtin_variables.cpp b/mesalib/src/glsl/builtin_variables.cpp index 4bb361c2e..f4ac20543 100644 --- a/mesalib/src/glsl/builtin_variables.cpp +++ b/mesalib/src/glsl/builtin_variables.cpp @@ -790,6 +790,13 @@ generate_130_uniforms(exec_list *instructions, state->Const.MaxClipPlanes); add_builtin_constant(instructions, symtab, "gl_MaxVaryingComponents", state->Const.MaxVaryingFloats); + + if (state->ARB_shading_language_420pack_enable) { + add_builtin_constant(instructions, symtab, "gl_MinProgramTexelOffset", + state->Const.MinProgramTexelOffset); + add_builtin_constant(instructions, symtab, "gl_MaxProgramTexelOffset", + state->Const.MaxProgramTexelOffset); + } } diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index 81ba04bcc..ff5bdfe5d 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -1184,14 +1184,14 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) parser->is_gles = false; /* Add pre-defined macros. */ - if (extensions != NULL) { - if (extensions->OES_EGL_image_external) - add_builtin_define(parser, "GL_OES_EGL_image_external", 1); - } - if (api == API_OPENGLES2) { - parser->is_gles = true; - add_builtin_define(parser, "GL_ES", 1); + parser->is_gles = true; + add_builtin_define(parser, "GL_ES", 1); + + if (extensions != NULL) { + if (extensions->OES_EGL_image_external) + add_builtin_define(parser, "GL_OES_EGL_image_external", 1); + } } else { add_builtin_define(parser, "GL_ARB_draw_buffers", 1); add_builtin_define(parser, "GL_ARB_texture_rectangle", 1); @@ -1242,6 +1242,9 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) if (extensions->AMD_vertex_shader_layer) add_builtin_define(parser, "GL_AMD_vertex_shader_layer", 1); + + if (extensions->ARB_shading_language_420pack) + add_builtin_define(parser, "GL_ARB_shading_language_420pack", 1); } } @@ -2064,6 +2067,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio add_builtin_define (parser, "GL_ES", 1); } + if (version >= 150) + add_builtin_define(parser, "GL_core_profile", 1); + /* Currently, all ES2/ES3 implementations support highp in the * fragment shader, so we always define this macro in ES2/ES3. * If we ever get a driver that doesn't support highp, we'll diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy index 6e92c2651..56367f8c6 100644 --- a/mesalib/src/glsl/glsl_parser.yy +++ b/mesalib/src/glsl/glsl_parser.yy @@ -267,10 +267,16 @@ version_statement: | VERSION_TOK INTCONSTANT EOL { state->process_version_directive(&@2, $2, NULL); + if (state->error) { + YYERROR; + } } | VERSION_TOK INTCONSTANT any_identifier EOL { state->process_version_directive(&@2, $2, $3); + if (state->error) { + YYERROR; + } } ; diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index c0dd71370..98627145a 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -226,6 +226,19 @@ _mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version, if (ident) { if (strcmp(ident, "es") == 0) { es_token_present = true; + } else if (version >= 150) { + if (strcmp(ident, "core") == 0) { + /* Accept the token. There's no need to record that this is + * a core profile shader since that's the only profile we support. + */ + } else if (strcmp(ident, "compatibility") == 0) { + _mesa_glsl_error(locp, this, + "The compatibility profile is not supported.\n"); + } else { + _mesa_glsl_error(locp, this, + "\"%s\" is not a valid shading language profile; " + "if present, it must be \"core\".\n", ident); + } } else { _mesa_glsl_error(locp, this, "Illegal text following version number\n"); @@ -466,6 +479,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT(OES_standard_derivatives, false, false, true, false, true, OES_standard_derivatives), EXT(ARB_texture_cube_map_array, true, false, true, true, false, ARB_texture_cube_map_array), EXT(ARB_shading_language_packing, true, false, true, true, false, ARB_shading_language_packing), + EXT(ARB_shading_language_420pack, true, true, true, true, false, ARB_shading_language_420pack), EXT(ARB_texture_multisample, true, false, true, true, false, ARB_texture_multisample), EXT(ARB_texture_query_lod, false, false, true, true, false, ARB_texture_query_lod), EXT(ARB_gpu_shader5, true, true, true, true, false, ARB_gpu_shader5), diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h index 16e180d3e..95918de72 100644 --- a/mesalib/src/glsl/glsl_parser_extras.h +++ b/mesalib/src/glsl/glsl_parser_extras.h @@ -288,6 +288,8 @@ struct _mesa_glsl_parse_state { bool ARB_gpu_shader5_warn; bool AMD_vertex_shader_layer_enable; bool AMD_vertex_shader_layer_warn; + bool ARB_shading_language_420pack_enable; + bool ARB_shading_language_420pack_warn; /*@}*/ /** Extensions supported by the OpenGL implementation. */ diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp index 0035a5f81..ceb0a4cdb 100644 --- a/mesalib/src/glsl/hir_field_selection.cpp +++ b/mesalib/src/glsl/hir_field_selection.cpp @@ -47,20 +47,6 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr, YYLTYPE loc = expr->get_location(); if (op->type->is_error()) { /* silently propagate the error */ - } else if (op->type->is_vector()) { - ir_swizzle *swiz = ir_swizzle::create(op, - expr->primary_expression.identifier, - op->type->vector_elements); - if (swiz != NULL) { - result = swiz; - } else { - /* FINISHME: Logging of error messages should be moved into - * FINISHME: ir_swizzle::create. This allows the generation of more - * FINISHME: specific error messages. - */ - _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'", - expr->primary_expression.identifier); - } } else if (op->type->base_type == GLSL_TYPE_STRUCT || op->type->base_type == GLSL_TYPE_INTERFACE) { result = new(ctx) ir_dereference_record(op, @@ -81,17 +67,51 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr, const char *method; method = call->subexpressions[0]->primary_expression.identifier; - if (op->type->is_array() && strcmp(method, "length") == 0) { - if (!call->expressions.is_empty()) - _mesa_glsl_error(&loc, state, "length method takes no arguments."); + if (strcmp(method, "length") == 0) { + if (!call->expressions.is_empty()) + _mesa_glsl_error(&loc, state, "length method takes no arguments."); - if (op->type->array_size() == 0) - _mesa_glsl_error(&loc, state, "length called on unsized array."); + if (op->type->is_array()) { + if (op->type->array_size() == 0) + _mesa_glsl_error(&loc, state, "length called on unsized array."); - result = new(ctx) ir_constant(op->type->array_size()); + result = new(ctx) ir_constant(op->type->array_size()); + } else if (op->type->is_vector()) { + if (state->ARB_shading_language_420pack_enable) { + /* .length() returns int. */ + result = new(ctx) ir_constant((int) op->type->vector_elements); + } else { + _mesa_glsl_error(&loc, state, "length method on matrix only available" + "with ARB_shading_language_420pack."); + } + } else if (op->type->is_matrix()) { + if (state->ARB_shading_language_420pack_enable) { + /* .length() returns int. */ + result = new(ctx) ir_constant((int) op->type->matrix_columns); + } else { + _mesa_glsl_error(&loc, state, "length method on matrix only available" + "with ARB_shading_language_420pack."); + } + } } else { _mesa_glsl_error(&loc, state, "Unknown method: `%s'.", method); } + } else if (op->type->is_vector() || + (state->ARB_shading_language_420pack_enable && + op->type->is_scalar())) { + ir_swizzle *swiz = ir_swizzle::create(op, + expr->primary_expression.identifier, + op->type->vector_elements); + if (swiz != NULL) { + result = swiz; + } else { + /* FINISHME: Logging of error messages should be moved into + * FINISHME: ir_swizzle::create. This allows the generation of more + * FINISHME: specific error messages. + */ + _mesa_glsl_error(& loc, state, "Invalid swizzle / mask `%s'", + expr->primary_expression.identifier); + } } else { _mesa_glsl_error(& loc, state, "Cannot access field `%s' of " "non-structure / non-vector.", diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp index b3667124f..51534ca7c 100644 --- a/mesalib/src/glsl/ir_reader.cpp +++ b/mesalib/src/glsl/ir_reader.cpp @@ -886,7 +886,7 @@ ir_reader::read_dereference(s_expression *expr) } ir_rvalue *idx = read_rvalue(s_index); - if (subject == NULL) { + if (idx == NULL) { ir_read_error(NULL, "when reading the index of an array_ref"); return NULL; } diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index ad636681f..208778e4a 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -170,6 +170,7 @@ public: void process(ir_variable *var) { + this->is_ubo_var = var->is_in_uniform_block(); if (var->is_interface_instance()) program_resource_visitor::process(var->interface_type, var->interface_type->name); @@ -197,6 +198,8 @@ public: */ unsigned num_shader_uniform_components; + bool is_ubo_var; + private: virtual void visit_field(const glsl_type *type, const char *name, bool row_major) @@ -222,7 +225,8 @@ private: * Note that samplers do not count against this limit because they * don't use any storage on current hardware. */ - this->num_shader_uniform_components += values; + if (!is_ubo_var) + this->num_shader_uniform_components += values; } /* If the uniform is already in the map, there's nothing more to do. @@ -640,7 +644,9 @@ link_assign_uniform_locations(struct gl_shader_program *prog) */ count_uniform_size uniform_size(prog->UniformHash); for (unsigned i = 0; i < MESA_SHADER_TYPES; i++) { - if (prog->_LinkedShaders[i] == NULL) + struct gl_shader *sh = prog->_LinkedShaders[i]; + + if (sh == NULL) continue; /* Uniforms that lack an initializer in the shader code have an initial @@ -652,16 +658,15 @@ link_assign_uniform_locations(struct gl_shader_program *prog) * initializer, if present, or 0 if no initializer is present. Sampler * types cannot have initializers." */ - memset(prog->_LinkedShaders[i]->SamplerUnits, 0, - sizeof(prog->_LinkedShaders[i]->SamplerUnits)); + memset(sh->SamplerUnits, 0, sizeof(sh->SamplerUnits)); - link_update_uniform_buffer_variables(prog->_LinkedShaders[i]); + link_update_uniform_buffer_variables(sh); /* Reset various per-shader target counts. */ uniform_size.start_shader(); - foreach_list(node, prog->_LinkedShaders[i]->ir) { + foreach_list(node, sh->ir) { ir_variable *const var = ((ir_instruction *) node)->as_variable(); if ((var == NULL) || (var->mode != ir_var_uniform)) @@ -678,9 +683,14 @@ link_assign_uniform_locations(struct gl_shader_program *prog) uniform_size.process(var); } - prog->_LinkedShaders[i]->num_samplers = uniform_size.num_shader_samplers; - prog->_LinkedShaders[i]->num_uniform_components = - uniform_size.num_shader_uniform_components; + sh->num_samplers = uniform_size.num_shader_samplers; + sh->num_uniform_components = uniform_size.num_shader_uniform_components; + + sh->num_combined_uniform_components = sh->num_uniform_components; + for (unsigned i = 0; i < sh->NumUniformBlocks; i++) { + sh->num_combined_uniform_components += + sh->UniformBlocks[i].UniformBufferSize / 4; + } } const unsigned num_user_uniforms = uniform_size.num_active_uniforms; @@ -729,6 +739,20 @@ link_assign_uniform_locations(struct gl_shader_program *prog) sizeof(prog->_LinkedShaders[i]->SamplerTargets)); } + /* Determine the size of the largest uniform array queryable via + * glGetUniformLocation. Using this as the location scale guarantees that + * there is enough "room" for the array index to be stored in the low order + * part of the uniform location. It also makes the locations be more + * tightly packed. + */ + unsigned max_array_size = 1; + for (unsigned i = 0; i < num_user_uniforms; i++) { + if (uniforms[i].array_elements > max_array_size) + max_array_size = uniforms[i].array_elements; + } + + prog->UniformLocationBaseScale = max_array_size; + #ifndef NDEBUG for (unsigned i = 0; i < num_user_uniforms; i++) { assert(uniforms[i].storage != NULL); diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 982fe46bd..cd8d680ae 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -1523,12 +1523,18 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) ctx->Const.GeometryProgram.MaxTextureImageUnits }; - const unsigned max_uniform_components[MESA_SHADER_TYPES] = { + const unsigned max_default_uniform_components[MESA_SHADER_TYPES] = { ctx->Const.VertexProgram.MaxUniformComponents, ctx->Const.FragmentProgram.MaxUniformComponents, ctx->Const.GeometryProgram.MaxUniformComponents }; + const unsigned max_combined_uniform_components[MESA_SHADER_TYPES] = { + ctx->Const.VertexProgram.MaxCombinedUniformComponents, + ctx->Const.FragmentProgram.MaxCombinedUniformComponents, + ctx->Const.GeometryProgram.MaxCombinedUniformComponents + }; + const unsigned max_uniform_blocks[MESA_SHADER_TYPES] = { ctx->Const.VertexProgram.MaxUniformBlocks, ctx->Const.FragmentProgram.MaxUniformBlocks, @@ -1546,7 +1552,22 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) shader_names[i]); } - if (sh->num_uniform_components > max_uniform_components[i]) { + if (sh->num_uniform_components > max_default_uniform_components[i]) { + if (ctx->Const.GLSLSkipStrictMaxUniformLimitCheck) { + linker_warning(prog, "Too many %s shader default uniform block " + "components, but the driver will try to optimize " + "them out; this is non-portable out-of-spec " + "behavior\n", + shader_names[i]); + } else { + linker_error(prog, "Too many %s shader default uniform block " + "components", + shader_names[i]); + } + } + + if (sh->num_combined_uniform_components > + max_combined_uniform_components[i]) { if (ctx->Const.GLSLSkipStrictMaxUniformLimitCheck) { linker_warning(prog, "Too many %s shader uniform components, " "but the driver will try to optimize them out; " diff --git a/mesalib/src/glsl/lower_named_interface_blocks.cpp b/mesalib/src/glsl/lower_named_interface_blocks.cpp index eba667a8b..922cc024f 100644 --- a/mesalib/src/glsl/lower_named_interface_blocks.cpp +++ b/mesalib/src/glsl/lower_named_interface_blocks.cpp @@ -72,7 +72,8 @@ public: hash_table *interface_namespace; flatten_named_interface_blocks_declarations(void *mem_ctx) - : mem_ctx(mem_ctx) + : mem_ctx(mem_ctx), + interface_namespace(NULL) { } diff --git a/mesalib/src/mapi/entry.c b/mesalib/src/mapi/entry.c index 3d9168a72..128f0115d 100644 --- a/mesalib/src/mapi/entry.c +++ b/mesalib/src/mapi/entry.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/entry.h b/mesalib/src/mapi/entry.h index 9df810004..dba1c06a3 100644 --- a/mesalib/src/mapi/entry.h +++ b/mesalib/src/mapi/entry.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/entry_x86-64_tls.h b/mesalib/src/mapi/entry_x86-64_tls.h index 36cad00c2..71e9d6063 100644 --- a/mesalib/src/mapi/entry_x86-64_tls.h +++ b/mesalib/src/mapi/entry_x86-64_tls.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/entry_x86_tls.h b/mesalib/src/mapi/entry_x86_tls.h index 58d09caa6..fa7bc15b8 100644 --- a/mesalib/src/mapi/entry_x86_tls.h +++ b/mesalib/src/mapi/entry_x86_tls.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/entry_x86_tsd.h b/mesalib/src/mapi/entry_x86_tsd.h index c479c199e..ece00fac0 100644 --- a/mesalib/src/mapi/entry_x86_tsd.h +++ b/mesalib/src/mapi/entry_x86_tsd.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/glapi/gen/mesadef.py b/mesalib/src/mapi/glapi/gen/mesadef.py index eefda7643..f6d33cb8c 100644 --- a/mesalib/src/mapi/glapi/gen/mesadef.py +++ b/mesalib/src/mapi/glapi/gen/mesadef.py @@ -2,7 +2,6 @@ # Mesa 3-D graphics library -# Version: 4.1 # # Copyright (C) 1999-2001 Brian Paul All Rights Reserved. # diff --git a/mesalib/src/mapi/glapi/glapi.c b/mesalib/src/mapi/glapi/glapi.c index 18a7d31a7..3a0b638f7 100644 --- a/mesalib/src/mapi/glapi/glapi.c +++ b/mesalib/src/mapi/glapi/glapi.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h index bacc4c5f6..c764271b0 100644 --- a/mesalib/src/mapi/glapi/glapi.h +++ b/mesalib/src/mapi/glapi/glapi.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/glapi/glapi_dispatch.c b/mesalib/src/mapi/glapi/glapi_dispatch.c index 7f8056242..b4c8c7773 100644 --- a/mesalib/src/mapi/glapi/glapi_dispatch.c +++ b/mesalib/src/mapi/glapi/glapi_dispatch.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/glapi/glapi_entrypoint.c b/mesalib/src/mapi/glapi/glapi_entrypoint.c index 6b03548fe..362a8f11b 100644 --- a/mesalib/src/mapi/glapi/glapi_entrypoint.c +++ b/mesalib/src/mapi/glapi/glapi_entrypoint.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/glapi/glapi_getproc.c b/mesalib/src/mapi/glapi/glapi_getproc.c index 3cbd68fda..bfde92cf2 100644 --- a/mesalib/src/mapi/glapi/glapi_getproc.c +++ b/mesalib/src/mapi/glapi/glapi_getproc.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/glapi/glapi_nop.c b/mesalib/src/mapi/glapi/glapi_nop.c index bdd1786fe..2597c8cb8 100644 --- a/mesalib/src/mapi/glapi/glapi_nop.c +++ b/mesalib/src/mapi/glapi/glapi_nop.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.8 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2010 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h index ea32f302f..795e0a200 100644 --- a/mesalib/src/mapi/glapi/glapi_priv.h +++ b/mesalib/src/mapi/glapi/glapi_priv.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/mapi.c b/mesalib/src/mapi/mapi.c index b471c40b1..56f209bfa 100644 --- a/mesalib/src/mapi/mapi.c +++ b/mesalib/src/mapi/mapi.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/mapi.h b/mesalib/src/mapi/mapi.h index c7e43e22e..2aa8d9fe0 100644 --- a/mesalib/src/mapi/mapi.h +++ b/mesalib/src/mapi/mapi.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/mapi_abi.py b/mesalib/src/mapi/mapi_abi.py index 6bfcfa9af..faa34311c 100644 --- a/mesalib/src/mapi/mapi_abi.py +++ b/mesalib/src/mapi/mapi_abi.py @@ -1,7 +1,6 @@ #!/usr/bin/env python # Mesa 3-D graphics library -# Version: 7.9 # # Copyright (C) 2010 LunarG Inc. # diff --git a/mesalib/src/mapi/mapi_glapi.c b/mesalib/src/mapi/mapi_glapi.c index a6838ce61..7b9f1aee4 100644 --- a/mesalib/src/mapi/mapi_glapi.c +++ b/mesalib/src/mapi/mapi_glapi.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2010 LunarG Inc. diff --git a/mesalib/src/mapi/mapi_tmp.h b/mesalib/src/mapi/mapi_tmp.h index f326b4a4e..dee3050fe 100644 --- a/mesalib/src/mapi/mapi_tmp.h +++ b/mesalib/src/mapi/mapi_tmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/stub.c b/mesalib/src/mapi/stub.c index 688dc8143..acd2c0a79 100644 --- a/mesalib/src/mapi/stub.c +++ b/mesalib/src/mapi/stub.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/stub.h b/mesalib/src/mapi/stub.h index 98e2553ec..953a0fae5 100644 --- a/mesalib/src/mapi/stub.h +++ b/mesalib/src/mapi/stub.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/table.c b/mesalib/src/mapi/table.c index 9bb9f654a..0d2866618 100644 --- a/mesalib/src/mapi/table.c +++ b/mesalib/src/mapi/table.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/table.h b/mesalib/src/mapi/table.h index d84523f77..df59aed4f 100644 --- a/mesalib/src/mapi/table.h +++ b/mesalib/src/mapi/table.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mapi/u_current.c b/mesalib/src/mapi/u_current.c index 344344939..07213380d 100644 --- a/mesalib/src/mapi/u_current.c +++ b/mesalib/src/mapi/u_current.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/u_execmem.c b/mesalib/src/mapi/u_execmem.c index b6751edb5..357365263 100644 --- a/mesalib/src/mapi/u_execmem.c +++ b/mesalib/src/mapi/u_execmem.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mapi/u_thread.h b/mesalib/src/mapi/u_thread.h index 2f8154373..31999c4df 100644 --- a/mesalib/src/mapi/u_thread.h +++ b/mesalib/src/mapi/u_thread.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.c b/mesalib/src/mesa/drivers/common/driverfuncs.c index 4f7696c4c..016c0e80f 100644 --- a/mesalib/src/mesa/drivers/common/driverfuncs.c +++ b/mesalib/src/mesa/drivers/common/driverfuncs.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/drivers/common/driverfuncs.h b/mesalib/src/mesa/drivers/common/driverfuncs.h index 806c8b0af..6b9a90074 100644 --- a/mesalib/src/mesa/drivers/common/driverfuncs.h +++ b/mesalib/src/mesa/drivers/common/driverfuncs.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 1250bd35c..f7dd06aeb 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * @@ -655,7 +654,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE); if (ctx->Extensions.ARB_texture_cube_map) _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE); - if (ctx->Extensions.OES_EGL_image_external) + if (_mesa_is_gles(ctx) && + ctx->Extensions.OES_EGL_image_external) _mesa_set_enable(ctx, GL_TEXTURE_EXTERNAL_OES, GL_FALSE); if (ctx->API == API_OPENGL_COMPAT) { @@ -3851,9 +3851,16 @@ _mesa_meta_CopyTexSubImage(struct gl_context *ctx, GLuint dims, */ _mesa_meta_begin(ctx, MESA_META_PIXEL_STORE); - ctx->Driver.TexSubImage(ctx, dims, texImage, - xoffset, yoffset, zoffset, width, height, 1, - format, type, buf, &ctx->Unpack); + if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) { + assert(yoffset == 0); + ctx->Driver.TexSubImage(ctx, dims, texImage, + xoffset, zoffset, 0, width, 1, 1, + format, type, buf, &ctx->Unpack); + } else { + ctx->Driver.TexSubImage(ctx, dims, texImage, + xoffset, yoffset, zoffset, width, height, 1, + format, type, buf, &ctx->Unpack); + } _mesa_meta_end(ctx); diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h index 823be14c7..53d7b8ab5 100644 --- a/mesalib/src/mesa/drivers/common/meta.h +++ b/mesalib/src/mesa/drivers/common/meta.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * @@ -117,7 +116,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, extern void _mesa_meta_CopyTexSubImage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage, - GLint xoffset, GLint yoffset, GLint zoffset, + GLint xoffset, GLint yoffset, GLint slice, struct gl_renderbuffer *rb, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h index b51993c94..535f6fe59 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright 2008, 2010 George Sapountzis <gsapountzis@gmail.com> diff --git a/mesalib/src/mesa/main/accum.c b/mesalib/src/mesa/main/accum.c index b4677397b..421fe6cc5 100644 --- a/mesalib/src/mesa/main/accum.c +++ b/mesalib/src/mesa/main/accum.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/accum.h b/mesalib/src/mesa/main/accum.h index 7e4d9f6b9..a5665c757 100644 --- a/mesalib/src/mesa/main/accum.h +++ b/mesalib/src/mesa/main/accum.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c index 8e581c8d9..ea0923837 100644 --- a/mesalib/src/mesa/main/api_arrayelt.c +++ b/mesalib/src/mesa/main/api_arrayelt.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_arrayelt.h b/mesalib/src/mesa/main/api_arrayelt.h index e250cb4c8..39fdeb9d2 100644 --- a/mesalib/src/mesa/main/api_arrayelt.h +++ b/mesalib/src/mesa/main/api_arrayelt.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_exec.h b/mesalib/src/mesa/main/api_exec.h index bcf461163..ff35b78bb 100644 --- a/mesalib/src/mesa/main/api_exec.h +++ b/mesalib/src/mesa/main/api_exec.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c index 938e9b5c0..22ae50d2b 100644 --- a/mesalib/src/mesa/main/api_loopback.c +++ b/mesalib/src/mesa/main/api_loopback.c @@ -6,7 +6,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h index af6572d1b..0b014ad5a 100644 --- a/mesalib/src/mesa/main/api_loopback.h +++ b/mesalib/src/mesa/main/api_loopback.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c index 30a195350..7ab8e305d 100644 --- a/mesalib/src/mesa/main/api_validate.c +++ b/mesalib/src/mesa/main/api_validate.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/api_validate.h b/mesalib/src/mesa/main/api_validate.h index a5004b8a3..f2b753ca9 100644 --- a/mesalib/src/mesa/main/api_validate.h +++ b/mesalib/src/mesa/main/api_validate.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c index 327f582cb..51a299370 100644 --- a/mesalib/src/mesa/main/arbprogram.c +++ b/mesalib/src/mesa/main/arbprogram.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/arbprogram.h b/mesalib/src/mesa/main/arbprogram.h index 2b31b9984..af0bdff1e 100644 --- a/mesalib/src/mesa/main/arbprogram.h +++ b/mesalib/src/mesa/main/arbprogram.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index 34d50955f..922605034 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/src/mesa/main/arrayobj.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * (C) Copyright IBM Corporation 2006 diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h index d7ff35a56..6dee1af69 100644 --- a/mesalib/src/mesa/main/arrayobj.h +++ b/mesalib/src/mesa/main/arrayobj.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * (C) Copyright IBM Corporation 2006 diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 249e88a4a..9358e699c 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/attrib.h b/mesalib/src/mesa/main/attrib.h index bb9fc5a94..44413a6e8 100644 --- a/mesalib/src/mesa/main/attrib.h +++ b/mesalib/src/mesa/main/attrib.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/bitset.h b/mesalib/src/mesa/main/bitset.h index aceaa0d4d..c3b060b01 100644 --- a/mesalib/src/mesa/main/bitset.h +++ b/mesalib/src/mesa/main/bitset.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c index 0c28352b2..c97c2078a 100644 --- a/mesalib/src/mesa/main/blend.c +++ b/mesalib/src/mesa/main/blend.c @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/blend.h b/mesalib/src/mesa/main/blend.h index b43b3ccb3..7445840cb 100644 --- a/mesalib/src/mesa/main/blend.h +++ b/mesalib/src/mesa/main/blend.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index ffb67b9b3..bd71688e8 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 249178a7a..9b582f8c1 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/buffers.c b/mesalib/src/mesa/main/buffers.c index 12e636b17..e80f0400f 100644 --- a/mesalib/src/mesa/main/buffers.c +++ b/mesalib/src/mesa/main/buffers.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/buffers.h b/mesalib/src/mesa/main/buffers.h index 59fce4b05..ebcfa1c1e 100644 --- a/mesalib/src/mesa/main/buffers.h +++ b/mesalib/src/mesa/main/buffers.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/clear.c b/mesalib/src/mesa/main/clear.c index fb3e576e6..304d135d1 100644 --- a/mesalib/src/mesa/main/clear.c +++ b/mesalib/src/mesa/main/clear.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/clear.h b/mesalib/src/mesa/main/clear.h index e410ee6f1..96ce47b92 100644 --- a/mesalib/src/mesa/main/clear.h +++ b/mesalib/src/mesa/main/clear.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/clip.c b/mesalib/src/mesa/main/clip.c index ebca202be..f994728bc 100644 --- a/mesalib/src/mesa/main/clip.c +++ b/mesalib/src/mesa/main/clip.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/clip.h b/mesalib/src/mesa/main/clip.h index dc65cf36c..7c46a6a0e 100644 --- a/mesalib/src/mesa/main/clip.h +++ b/mesalib/src/mesa/main/clip.h @@ -4,7 +4,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/colormac.h b/mesalib/src/mesa/main/colormac.h index 16c245225..c8adca6b6 100644 --- a/mesalib/src/mesa/main/colormac.h +++ b/mesalib/src/mesa/main/colormac.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/colortab.c b/mesalib/src/mesa/main/colortab.c index 18f993adf..81e92d71c 100644 --- a/mesalib/src/mesa/main/colortab.c +++ b/mesalib/src/mesa/main/colortab.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/colortab.h b/mesalib/src/mesa/main/colortab.h index 1c1854868..55c3b59fa 100644 --- a/mesalib/src/mesa/main/colortab.h +++ b/mesalib/src/mesa/main/colortab.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h index 1e10f2749..fb7baf84e 100644 --- a/mesalib/src/mesa/main/compiler.h +++ b/mesalib/src/mesa/main/compiler.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -317,7 +316,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) defined(__arm__) || \ defined(__sh__) || defined(__m32r__) || \ (defined(__sun) && defined(_IEEE_754)) || \ - (defined(__alpha__) && defined(__IEEE_FLOAT)) + defined(__alpha__) #define USE_IEEE #define IEEE_ONE 0x3f800000 #endif diff --git a/mesalib/src/mesa/main/condrender.c b/mesalib/src/mesa/main/condrender.c index bfd2b0818..3d9b0eca1 100644 --- a/mesalib/src/mesa/main/condrender.c +++ b/mesalib/src/mesa/main/condrender.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.8 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/condrender.h b/mesalib/src/mesa/main/condrender.h index cf6d4ca28..90d7fb722 100644 --- a/mesalib/src/mesa/main/condrender.h +++ b/mesalib/src/mesa/main/condrender.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.8 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/config.h b/mesalib/src/mesa/main/config.h index 4a4fdc98c..1d2ab4dc0 100644 --- a/mesalib/src/mesa/main/config.h +++ b/mesalib/src/mesa/main/config.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * Copyright (C) 2008 VMware, Inc. All Rights Reserved. @@ -187,7 +186,7 @@ #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4 #define MAX_PROGRAM_CALL_DEPTH 8 #define MAX_PROGRAM_TEMPS 256 -#define MAX_PROGRAM_ADDRESS_REGS 2 +#define MAX_PROGRAM_ADDRESS_REGS 1 #define MAX_VARYING 32 /**< number of float[4] vectors */ #define MAX_SAMPLERS MAX_TEXTURE_IMAGE_UNITS #define MAX_PROGRAM_INPUTS 32 diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 0053525e8..c59f755c6 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * Copyright (C) 2008 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/context.h b/mesalib/src/mesa/main/context.h index 0118e5f6a..8872be1f4 100644 --- a/mesalib/src/mesa/main/context.h +++ b/mesalib/src/mesa/main/context.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/convolve.c b/mesalib/src/mesa/main/convolve.c index 5f1e85b6b..f44031a9b 100644 --- a/mesalib/src/mesa/main/convolve.c +++ b/mesalib/src/mesa/main/convolve.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/convolve.h b/mesalib/src/mesa/main/convolve.h index 3d4c999d9..0c0a9dd5e 100644 --- a/mesalib/src/mesa/main/convolve.h +++ b/mesalib/src/mesa/main/convolve.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/core.h b/mesalib/src/mesa/main/core.h index c28a8af53..0ba0db8a3 100644 --- a/mesalib/src/mesa/main/core.h +++ b/mesalib/src/mesa/main/core.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mesa/main/cpuinfo.c b/mesalib/src/mesa/main/cpuinfo.c index 3b4ff8cd1..8d482a6ac 100644 --- a/mesalib/src/mesa/main/cpuinfo.c +++ b/mesalib/src/mesa/main/cpuinfo.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/cpuinfo.h b/mesalib/src/mesa/main/cpuinfo.h index 31de9b2e4..367888905 100644 --- a/mesalib/src/mesa/main/cpuinfo.h +++ b/mesalib/src/mesa/main/cpuinfo.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h index 13c7a83d4..e2519780a 100644 --- a/mesalib/src/mesa/main/dd.h +++ b/mesalib/src/mesa/main/dd.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -249,10 +248,16 @@ struct dd_function_table { /** * Called by glCopyTex[Sub]Image[123]D(). + * + * This function should copy a rectangular region in the rb to a single + * destination slice, specified by @slice. In the case of 1D array + * textures (where one GL call can potentially affect multiple destination + * slices), core mesa takes care of calling this function multiple times, + * once for each scanline to be copied. */ void (*CopyTexSubImage)(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage, - GLint xoffset, GLint yoffset, GLint zoffset, + GLint xoffset, GLint yoffset, GLint slice, struct gl_renderbuffer *rb, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c index bd75e4158..9434c1ea2 100644 --- a/mesalib/src/mesa/main/debug.c +++ b/mesalib/src/mesa/main/debug.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -52,9 +51,14 @@ tex_target_name(GLenum tgt) { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" }, { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" }, { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }, + { GL_TEXTURE_CUBE_MAP_ARRAY, "GL_TEXTURE_CUBE_MAP_ARRAY" }, + { GL_TEXTURE_BUFFER, "GL_TEXTURE_BUFFER" }, + { GL_TEXTURE_2D_MULTISAMPLE, "GL_TEXTURE_2D_MULTISAMPLE" }, + { GL_TEXTURE_2D_MULTISAMPLE_ARRAY, "GL_TEXTURE_2D_MULTISAMPLE_ARRAY" }, { GL_TEXTURE_EXTERNAL_OES, "GL_TEXTURE_EXTERNAL_OES" } }; GLuint i; + STATIC_ASSERT(Elements(tex_targets) == NUM_TEXTURE_TARGETS); for (i = 0; i < Elements(tex_targets); i++) { if (tex_targets[i].target == tgt) return tex_targets[i].name; diff --git a/mesalib/src/mesa/main/debug.h b/mesalib/src/mesa/main/debug.h index 919a6f3a1..8414c5ebd 100644 --- a/mesalib/src/mesa/main/debug.h +++ b/mesalib/src/mesa/main/debug.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/depth.c b/mesalib/src/mesa/main/depth.c index 68ad56184..29851ecb8 100644 --- a/mesalib/src/mesa/main/depth.c +++ b/mesalib/src/mesa/main/depth.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/depth.h b/mesalib/src/mesa/main/depth.h index 80e753837..5ff7a5e9e 100644 --- a/mesalib/src/mesa/main/depth.h +++ b/mesalib/src/mesa/main/depth.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index 18e3eb760..af2b468c5 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -7025,7 +7024,10 @@ save_SamplerParameteriv(GLuint sampler, GLenum pname, const GLint *params) static void GLAPIENTRY save_SamplerParameteri(GLuint sampler, GLenum pname, GLint param) { - save_SamplerParameteriv(sampler, pname, ¶m); + GLint parray[4]; + parray[0] = param; + parray[1] = parray[2] = parray[3] = 0; + save_SamplerParameteriv(sampler, pname, parray); } static void GLAPIENTRY diff --git a/mesalib/src/mesa/main/dlist.h b/mesalib/src/mesa/main/dlist.h index 4672d3e60..cd0b5235b 100644 --- a/mesalib/src/mesa/main/dlist.h +++ b/mesalib/src/mesa/main/dlist.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/drawpix.c b/mesalib/src/mesa/main/drawpix.c index e69113bb1..096615c05 100644 --- a/mesalib/src/mesa/main/drawpix.c +++ b/mesalib/src/mesa/main/drawpix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/drawpix.h b/mesalib/src/mesa/main/drawpix.h index 57accbf0a..eb2cb8922 100644 --- a/mesalib/src/mesa/main/drawpix.h +++ b/mesalib/src/mesa/main/drawpix.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/enable.h b/mesalib/src/mesa/main/enable.h index 060da5656..10755e549 100644 --- a/mesalib/src/mesa/main/enable.h +++ b/mesalib/src/mesa/main/enable.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/enums.h b/mesalib/src/mesa/main/enums.h index b2f373a4c..556c1db99 100644 --- a/mesalib/src/mesa/main/enums.h +++ b/mesalib/src/mesa/main/enums.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index 0ee3daef3..cc652bac8 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/errors.h b/mesalib/src/mesa/main/errors.h index b21a44c98..7e7503aa9 100644 --- a/mesalib/src/mesa/main/errors.h +++ b/mesalib/src/mesa/main/errors.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/eval.c b/mesalib/src/mesa/main/eval.c index 349331f00..42793ff4c 100644 --- a/mesalib/src/mesa/main/eval.c +++ b/mesalib/src/mesa/main/eval.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/eval.h b/mesalib/src/mesa/main/eval.h index 33240f00d..5b2fce119 100644 --- a/mesalib/src/mesa/main/eval.h +++ b/mesalib/src/mesa/main/eval.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/execmem.c b/mesalib/src/mesa/main/execmem.c index 5f319661e..d63bb4a4e 100644 --- a/mesalib/src/mesa/main/execmem.c +++ b/mesalib/src/mesa/main/execmem.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 39aaad48a..fc6fbadec 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -127,6 +126,7 @@ static const struct extension extension_table[] = { { "GL_ARB_shader_texture_lod", o(ARB_shader_texture_lod), GL, 2009 }, { "GL_ARB_shading_language_100", o(ARB_shading_language_100), GLL, 2003 }, { "GL_ARB_shading_language_packing", o(ARB_shading_language_packing), GL, 2011 }, + { "GL_ARB_shading_language_420pack", o(ARB_shading_language_420pack), GL, 2011 }, { "GL_ARB_shadow", o(ARB_shadow), GLL, 2001 }, { "GL_ARB_sync", o(ARB_sync), GL, 2003 }, { "GL_ARB_texture_border_clamp", o(ARB_texture_border_clamp), GLL, 2000 }, diff --git a/mesalib/src/mesa/main/extensions.h b/mesalib/src/mesa/main/extensions.h index 6e99116da..7a3791d58 100644 --- a/mesalib/src/mesa/main/extensions.h +++ b/mesalib/src/mesa/main/extensions.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 39fa242f7..ba462e935 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 1999-2009 VMware, Inc. All Rights Reserved. @@ -569,8 +568,15 @@ att_incomplete(const char *msg) * For debug only. */ static void -fbo_incomplete(const char *msg, int index) +fbo_incomplete(struct gl_context *ctx, const char *msg, int index) { + static GLuint msg_id; + + _mesa_gl_debug(ctx, &msg_id, + MESA_DEBUG_TYPE_OTHER, + MESA_DEBUG_SEVERITY_MEDIUM, + "FBO incomplete: %s [%d]\n", msg, index); + if (MESA_DEBUG_FLAGS & DEBUG_INCOMPLETE_FBO) { _mesa_debug(NULL, "FBO Incomplete: %s [%d]\n", msg, index); } @@ -864,7 +870,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, test_attachment_completeness(ctx, GL_DEPTH, att); if (!att->Complete) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; - fbo_incomplete("depth attachment incomplete", -1); + fbo_incomplete(ctx, "depth attachment incomplete", -1); return; } } @@ -873,7 +879,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, test_attachment_completeness(ctx, GL_STENCIL, att); if (!att->Complete) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; - fbo_incomplete("stencil attachment incomplete", -1); + fbo_incomplete(ctx, "stencil attachment incomplete", -1); return; } } @@ -882,7 +888,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, test_attachment_completeness(ctx, GL_COLOR, att); if (!att->Complete) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; - fbo_incomplete("color attachment incomplete", i); + fbo_incomplete(ctx, "color attachment incomplete", i); return; } } @@ -902,7 +908,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, if (!is_format_color_renderable(ctx, attFormat, texImg->InternalFormat) && !is_legal_depth_format(ctx, f)) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT; - fbo_incomplete("texture attachment incomplete", -1); + fbo_incomplete(ctx, "texture attachment incomplete", -1); return; } @@ -910,7 +916,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, numSamples = texImg->NumSamples; else if (numSamples != texImg->NumSamples) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE; - fbo_incomplete("inconsistent sample count", -1); + fbo_incomplete(ctx, "inconsistent sample count", -1); return; } @@ -918,7 +924,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, fixedSampleLocations = texImg->FixedSampleLocations; else if (fixedSampleLocations != texImg->FixedSampleLocations) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE; - fbo_incomplete("inconsistent fixed sample locations", -1); + fbo_incomplete(ctx, "inconsistent fixed sample locations", -1); return; } } @@ -935,7 +941,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, numSamples = att->Renderbuffer->NumSamples; else if (numSamples != att->Renderbuffer->NumSamples) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE; - fbo_incomplete("inconsistent sample count", -1); + fbo_incomplete(ctx, "inconsistent sample count", -1); return; } @@ -944,7 +950,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, fixedSampleLocations = GL_TRUE; else if (fixedSampleLocations != GL_TRUE) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE; - fbo_incomplete("inconsistent fixed sample locations", -1); + fbo_incomplete(ctx, "inconsistent fixed sample locations", -1); return; } } @@ -981,13 +987,13 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, /* check that width, height, format are same */ if (minWidth != maxWidth || minHeight != maxHeight) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT; - fbo_incomplete("width or height mismatch", -1); + fbo_incomplete(ctx, "width or height mismatch", -1); return; } /* check that all color buffers are the same format */ if (intFormat != GL_NONE && f != intFormat) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT; - fbo_incomplete("format mismatch", -1); + fbo_incomplete(ctx, "format mismatch", -1); return; } } @@ -998,7 +1004,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, if (att->Type == GL_RENDERBUFFER && att->Renderbuffer->Format == MESA_FORMAT_NONE) { fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED; - fbo_incomplete("unsupported renderbuffer format", i); + fbo_incomplete(ctx, "unsupported renderbuffer format", i); return; } @@ -1010,10 +1016,10 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, } else if (layer_count != att_layer_count) { if (layer_count == 0 || att_layer_count == 0) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS; - fbo_incomplete("framebuffer attachment layer mode is inconsistent", i); + fbo_incomplete(ctx, "framebuffer attachment layer mode is inconsistent", i); } else { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB; - fbo_incomplete("framebuffer attachment layer count is inconsistent", i); + fbo_incomplete(ctx, "framebuffer attachment layer count is inconsistent", i); } return; } @@ -1030,7 +1036,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, assert(att); if (att->Type == GL_NONE) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT; - fbo_incomplete("missing drawbuffer", j); + fbo_incomplete(ctx, "missing drawbuffer", j); return; } } @@ -1043,7 +1049,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, assert(att); if (att->Type == GL_NONE) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT; - fbo_incomplete("missing readbuffer", -1); + fbo_incomplete(ctx, "missing readbuffer", -1); return; } } @@ -1051,7 +1057,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, if (numImages == 0) { fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; - fbo_incomplete("no attachments", -1); + fbo_incomplete(ctx, "no attachments", -1); return; } @@ -1065,7 +1071,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, if (ctx->Driver.ValidateFramebuffer) { ctx->Driver.ValidateFramebuffer(ctx, fb); if (fb->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) { - fbo_incomplete("driver marked FBO as incomplete", -1); + fbo_incomplete(ctx, "driver marked FBO as incomplete", -1); } } diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h index dfd795a3a..4066ea65b 100644 --- a/mesalib/src/mesa/main/fbobject.h +++ b/mesalib/src/mesa/main/fbobject.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c index 990d1da6c..e751a3c1e 100644 --- a/mesalib/src/mesa/main/feedback.c +++ b/mesalib/src/mesa/main/feedback.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h index 48c0efc7d..08bc7620e 100644 --- a/mesalib/src/mesa/main/feedback.h +++ b/mesalib/src/mesa/main/feedback.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp index 91c425be6..d162da8db 100644 --- a/mesalib/src/mesa/main/ff_fragment_shader.cpp +++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp @@ -31,6 +31,7 @@ extern "C" { #include "glheader.h" #include "imports.h" #include "mtypes.h" +#include "main/context.h" #include "main/uniforms.h" #include "main/macros.h" #include "main/samplerobj.h" @@ -1309,7 +1310,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key) state->language_version = 130; state->es_shader = false; - if (ctx->Extensions.OES_EGL_image_external) + if (_mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external) state->OES_EGL_image_external_enable = true; _mesa_glsl_initialize_types(state); _mesa_glsl_initialize_variables(p.instructions, state); diff --git a/mesalib/src/mesa/main/fog.c b/mesalib/src/mesa/main/fog.c index 7601651c3..1bd072fb3 100644 --- a/mesalib/src/mesa/main/fog.c +++ b/mesalib/src/mesa/main/fog.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/fog.h b/mesalib/src/mesa/main/fog.h index 6bd1cc5ad..1467663ed 100644 --- a/mesalib/src/mesa/main/fog.h +++ b/mesalib/src/mesa/main/fog.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index fee52c1ea..07d2a7240 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h index 8dd71a086..64b4b9a01 100644 --- a/mesalib/src/mesa/main/formats.h +++ b/mesalib/src/mesa/main/formats.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c index 0337b8b08..1906a8a55 100644 --- a/mesalib/src/mesa/main/framebuffer.c +++ b/mesalib/src/mesa/main/framebuffer.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/framebuffer.h b/mesalib/src/mesa/main/framebuffer.h index 962f2a4e2..1b1caab09 100644 --- a/mesalib/src/mesa/main/framebuffer.h +++ b/mesalib/src/mesa/main/framebuffer.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index 593c75be2..d31ba011f 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -295,8 +295,9 @@ static const int extra_EXT_texture_integer_and_new_buffers[] = { EXTRA_END }; -static const int extra_GLSL_130[] = { +static const int extra_GLSL_130_es3[] = { EXTRA_GLSL_130, + EXTRA_API_ES3, EXTRA_END }; @@ -336,6 +337,12 @@ static const int extra_EXT_framebuffer_sRGB_and_new_buffers[] = { EXTRA_END }; +static const int extra_MESA_texture_array_es3[] = { + EXT(MESA_texture_array), + EXTRA_API_ES3, + EXTRA_END +}; + EXTRA_EXT(ARB_texture_cube_map); EXTRA_EXT(MESA_texture_array); EXTRA_EXT2(EXT_secondary_color, ARB_vertex_program); @@ -400,6 +407,12 @@ static const int extra_gl30_es3[] = { EXTRA_END, }; +static const int extra_gl32_es3[] = { + EXTRA_VERSION_32, + EXTRA_API_ES3, + EXTRA_END, +}; + static const int extra_ARB_vertex_program_api_es2[] = { EXT(ARB_vertex_program), @@ -717,6 +730,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu break; case GL_MAX_VARYING_FLOATS_ARB: + case GL_MAX_FRAGMENT_INPUT_COMPONENTS: v->value_int = ctx->Const.MaxVarying * 4; break; diff --git a/mesalib/src/mesa/main/get.h b/mesalib/src/mesa/main/get.h index f58bb9409..0f72508a7 100644 --- a/mesalib/src/mesa/main/get.h +++ b/mesalib/src/mesa/main/get.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index ef1ab02e1..f47b33fcd 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -329,6 +329,9 @@ descriptor=[ [ "MAJOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], [ "MINOR_VERSION", "LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3" ], + # GL 3.0 / GLES3 + [ "MAX_FRAGMENT_INPUT_COMPONENTS", "LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3" ], + # GL_ARB_ES3_compatibility [ "MAX_ELEMENT_INDEX", "CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3"], @@ -365,10 +368,18 @@ descriptor=[ # NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT [ "READ_FRAMEBUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_framebuffer_blit" ], +# GL_EXT_gpu_shader4 / GLSL 1.30 + [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130_es3" ], + [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130_es3" ], + # GL_EXT_pixel_buffer_object [ "PIXEL_PACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ], [ "PIXEL_UNPACK_BUFFER_BINDING_EXT", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_pixel_buffer_object" ], + # GL_EXT_texture_array + [ "TEXTURE_BINDING_2D_ARRAY", "LOC_CUSTOM, TYPE_INT, TEXTURE_2D_ARRAY_INDEX, extra_MESA_texture_array_es3" ], + [ "MAX_ARRAY_TEXTURE_LAYERS_EXT", "CONTEXT_INT(Const.MaxArrayTextureLayers), extra_MESA_texture_array_es3" ], + # GL_EXT_transform_feedback [ "TRANSFORM_FEEDBACK_BUFFER_BINDING", "LOC_CUSTOM, TYPE_INT, 0, extra_EXT_transform_feedback" ], [ "RASTERIZER_DISCARD", "CONTEXT_BOOL(RasterDiscard), extra_EXT_transform_feedback" ], @@ -498,8 +509,6 @@ descriptor=[ [ "TEXTURE_2D_ARRAY_EXT", "LOC_CUSTOM, TYPE_BOOLEAN, NO_OFFSET, NO_EXTRA" ], [ "TEXTURE_BINDING_1D", "LOC_CUSTOM, TYPE_INT, TEXTURE_1D_INDEX, NO_EXTRA" ], [ "TEXTURE_BINDING_1D_ARRAY", "LOC_CUSTOM, TYPE_INT, TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array" ], - [ "TEXTURE_BINDING_2D_ARRAY", "LOC_CUSTOM, TYPE_INT, TEXTURE_1D_ARRAY_INDEX, extra_MESA_texture_array" ], - [ "MAX_ARRAY_TEXTURE_LAYERS_EXT", "CONTEXT_INT(Const.MaxArrayTextureLayers), extra_MESA_texture_array" ], [ "TEXTURE_GEN_S", "LOC_TEXUNIT, TYPE_BIT_0, offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA" ], [ "TEXTURE_GEN_T", "LOC_TEXUNIT, TYPE_BIT_1, offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA" ], [ "TEXTURE_GEN_R", "LOC_TEXUNIT, TYPE_BIT_2, offsetof(struct gl_texture_unit, TexGenEnabled), NO_EXTRA" ], @@ -647,10 +656,6 @@ descriptor=[ # GL_ARB_color_buffer_float [ "RGBA_FLOAT_MODE_ARB", "BUFFER_FIELD(Visual.floatMode, TYPE_BOOLEAN), extra_core_ARB_color_buffer_float_and_new_buffers" ], -# GL_EXT_gpu_shader4 / GLSL 1.30 - [ "MIN_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MinProgramTexelOffset), extra_GLSL_130" ], - [ "MAX_PROGRAM_TEXEL_OFFSET", "CONTEXT_INT(Const.MaxProgramTexelOffset), extra_GLSL_130" ], - # GL_ARB_texture_buffer_object [ "MAX_TEXTURE_BUFFER_SIZE_ARB", "CONTEXT_INT(Const.MaxTextureBufferSize), extra_texture_buffer_object" ], [ "TEXTURE_BINDING_BUFFER_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_texture_buffer_object" ], diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c index 52985f148..1145d0f49 100644 --- a/mesalib/src/mesa/main/getstring.c +++ b/mesalib/src/mesa/main/getstring.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/glheader.h b/mesalib/src/mesa/main/glheader.h index fd6985118..c83c68f71 100644 --- a/mesalib/src/mesa/main/glheader.h +++ b/mesalib/src/mesa/main/glheader.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/hash.c b/mesalib/src/mesa/main/hash.c index e38158c75..6591af9a6 100644 --- a/mesalib/src/mesa/main/hash.c +++ b/mesalib/src/mesa/main/hash.c @@ -12,7 +12,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/hash.h b/mesalib/src/mesa/main/hash.h index a3171df6b..142d2842c 100644 --- a/mesalib/src/mesa/main/hash.h +++ b/mesalib/src/mesa/main/hash.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/hint.c b/mesalib/src/mesa/main/hint.c index ed0394bc8..6d3e58d58 100644 --- a/mesalib/src/mesa/main/hint.c +++ b/mesalib/src/mesa/main/hint.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/hint.h b/mesalib/src/mesa/main/hint.h index f702fbf51..87febfeec 100644 --- a/mesalib/src/mesa/main/hint.h +++ b/mesalib/src/mesa/main/hint.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/histogram.c b/mesalib/src/mesa/main/histogram.c index 88440ad71..e6e6a6fd1 100644 --- a/mesalib/src/mesa/main/histogram.c +++ b/mesalib/src/mesa/main/histogram.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/histogram.h b/mesalib/src/mesa/main/histogram.h index a1ec5185b..1d145a03b 100644 --- a/mesalib/src/mesa/main/histogram.h +++ b/mesalib/src/mesa/main/histogram.h @@ -10,7 +10,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c index 42fec10e1..4ea5f04c9 100644 --- a/mesalib/src/mesa/main/image.c +++ b/mesalib/src/mesa/main/image.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/image.h b/mesalib/src/mesa/main/image.h index 5515be630..abd84bf2f 100644 --- a/mesalib/src/mesa/main/image.h +++ b/mesalib/src/mesa/main/image.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index ba30d8e84..ca6b1d53e 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/src/mesa/main/imports.c @@ -20,7 +20,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index 1678f71b2..53e40b445 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c index a3a576efd..d8ef8f258 100644 --- a/mesalib/src/mesa/main/light.c +++ b/mesalib/src/mesa/main/light.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/light.h b/mesalib/src/mesa/main/light.h index 2247a7494..c6fba2ea3 100644 --- a/mesalib/src/mesa/main/light.h +++ b/mesalib/src/mesa/main/light.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/lines.c b/mesalib/src/mesa/main/lines.c index 30eb21880..0df9d66b0 100644 --- a/mesalib/src/mesa/main/lines.c +++ b/mesalib/src/mesa/main/lines.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/lines.h b/mesalib/src/mesa/main/lines.h index a6a610e71..fa15e50ac 100644 --- a/mesalib/src/mesa/main/lines.h +++ b/mesalib/src/mesa/main/lines.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h index ac2467209..ddfeee226 100644 --- a/mesalib/src/mesa/main/macros.h +++ b/mesalib/src/mesa/main/macros.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * @@ -142,7 +141,6 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256]; *** CLAMPED_FLOAT_TO_UBYTE: map float known to be in [0,1] to ubyte in [0,255] ***/ #if defined(USE_IEEE) && !defined(DEBUG) -#define IEEE_0996 0x3f7f0000 /* 0.996 or so */ /* This function/macro is sensitive to precision. Test very carefully * if you change it! */ @@ -152,7 +150,7 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256]; __tmp.f = (F); \ if (__tmp.i < 0) \ UB = (GLubyte) 0; \ - else if (__tmp.i >= IEEE_0996) \ + else if (__tmp.i >= IEEE_ONE) \ UB = (GLubyte) 255; \ else { \ __tmp.f = __tmp.f * (255.0F/256.0F) + 32768.0F; \ diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c index 0ba7e9357..b2130221f 100644 --- a/mesalib/src/mesa/main/matrix.c +++ b/mesalib/src/mesa/main/matrix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/matrix.h b/mesalib/src/mesa/main/matrix.h index 74e7d6183..8eee67ca3 100644 --- a/mesalib/src/mesa/main/matrix.h +++ b/mesalib/src/mesa/main/matrix.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c index e9741f3e0..f1e12e8cf 100644 --- a/mesalib/src/mesa/main/mipmap.c +++ b/mesalib/src/mesa/main/mipmap.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/mipmap.h b/mesalib/src/mesa/main/mipmap.h index 6e26d5ba0..d5bd1d83d 100644 --- a/mesalib/src/mesa/main/mipmap.h +++ b/mesalib/src/mesa/main/mipmap.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 186f8a03b..0002da5c0 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. @@ -2141,13 +2140,21 @@ struct gl_shader gl_texture_index SamplerTargets[MAX_SAMPLERS]; /** - * Number of uniform components used by this shader. + * Number of default uniform block components used by this shader. * * This field is only set post-linking. */ unsigned num_uniform_components; /** + * Number of combined uniform components used by this shader. + * + * This field is only set post-linking. It is the sum of the uniform block + * sizes divided by sizeof(float), and num_uniform_compoennts. + */ + unsigned num_combined_uniform_components; + + /** * This shader's uniform block information. * * The offsets of the variables are assigned only for shaders in a program's @@ -2326,6 +2333,21 @@ struct gl_shader_program unsigned NumUniformBlocks; /** + * Scale factor for the uniform base location + * + * This is used to generate locations (returned by \c glGetUniformLocation) + * of uniforms. The base location of the uniform is multiplied by this + * value, and the array index is added. + * + * \note + * Must be >= 1. + * + * \sa + * _mesa_uniform_merge_location_offset, _mesa_uniform_split_location_offset + */ + unsigned UniformLocationBaseScale; + + /** * Indices into the _LinkedShaders's UniformBlocks[] array for each stage * they're used in, or -1. * @@ -3000,6 +3022,7 @@ struct gl_extensions GLboolean ARB_shader_texture_lod; GLboolean ARB_shading_language_100; GLboolean ARB_shading_language_packing; + GLboolean ARB_shading_language_420pack; GLboolean ARB_shadow; GLboolean ARB_sync; GLboolean ARB_texture_border_clamp; diff --git a/mesalib/src/mesa/main/multisample.c b/mesalib/src/mesa/main/multisample.c index 02d6ca453..f4116ca00 100644 --- a/mesalib/src/mesa/main/multisample.c +++ b/mesalib/src/mesa/main/multisample.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h index d6995d8fb..66848d269 100644 --- a/mesalib/src/mesa/main/multisample.h +++ b/mesalib/src/mesa/main/multisample.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/pixel.c b/mesalib/src/mesa/main/pixel.c index 0552de666..7162c6fef 100644 --- a/mesalib/src/mesa/main/pixel.c +++ b/mesalib/src/mesa/main/pixel.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/pixel.h b/mesalib/src/mesa/main/pixel.h index 88fc0cf99..c12ef97b8 100644 --- a/mesalib/src/mesa/main/pixel.h +++ b/mesalib/src/mesa/main/pixel.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/pixelstore.c b/mesalib/src/mesa/main/pixelstore.c index cf871dc5c..0f55bc304 100644 --- a/mesalib/src/mesa/main/pixelstore.c +++ b/mesalib/src/mesa/main/pixelstore.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/pixelstore.h b/mesalib/src/mesa/main/pixelstore.h index 1ffc8f8b8..1b5347daf 100644 --- a/mesalib/src/mesa/main/pixelstore.h +++ b/mesalib/src/mesa/main/pixelstore.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/points.c b/mesalib/src/mesa/main/points.c index 71b1a4166..de26bf961 100644 --- a/mesalib/src/mesa/main/points.c +++ b/mesalib/src/mesa/main/points.c @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/points.h b/mesalib/src/mesa/main/points.h index 797f83158..c3d0f691b 100644 --- a/mesalib/src/mesa/main/points.h +++ b/mesalib/src/mesa/main/points.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/polygon.c b/mesalib/src/mesa/main/polygon.c index 0ded7434c..611cef653 100644 --- a/mesalib/src/mesa/main/polygon.c +++ b/mesalib/src/mesa/main/polygon.c @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/polygon.h b/mesalib/src/mesa/main/polygon.h index 651c3356c..69c5cbc45 100644 --- a/mesalib/src/mesa/main/polygon.h +++ b/mesalib/src/mesa/main/polygon.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index 0d6fe39d4..b74898cee 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index 5b9ff5820..6cbcabd46 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c index e578c6cc8..1acdb8b53 100644 --- a/mesalib/src/mesa/main/rastpos.c +++ b/mesalib/src/mesa/main/rastpos.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h index 45968f304..2d36936de 100644 --- a/mesalib/src/mesa/main/rastpos.h +++ b/mesalib/src/mesa/main/rastpos.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index 85952d671..51a0b1553 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/readpix.h b/mesalib/src/mesa/main/readpix.h index 9e2d58ae9..4bb35e17e 100644 --- a/mesalib/src/mesa/main/readpix.h +++ b/mesalib/src/mesa/main/readpix.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/remap.c b/mesalib/src/mesa/main/remap.c index 44ec96498..4a881865a 100644 --- a/mesalib/src/mesa/main/remap.c +++ b/mesalib/src/mesa/main/remap.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org> * diff --git a/mesalib/src/mesa/main/remap.h b/mesalib/src/mesa/main/remap.h index bfef6ac4e..7199169d3 100644 --- a/mesalib/src/mesa/main/remap.h +++ b/mesalib/src/mesa/main/remap.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org> * diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c index c82b5cd85..d2bde803f 100644 --- a/mesalib/src/mesa/main/renderbuffer.c +++ b/mesalib/src/mesa/main/renderbuffer.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/renderbuffer.h b/mesalib/src/mesa/main/renderbuffer.h index e3e56d29e..aa83120c1 100644 --- a/mesalib/src/mesa/main/renderbuffer.h +++ b/mesalib/src/mesa/main/renderbuffer.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/scissor.c b/mesalib/src/mesa/main/scissor.c index 538ed595e..0eddaa6c1 100644 --- a/mesalib/src/mesa/main/scissor.c +++ b/mesalib/src/mesa/main/scissor.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/scissor.h b/mesalib/src/mesa/main/scissor.h index 2ac0c88da..0d7e2010a 100644 --- a/mesalib/src/mesa/main/scissor.h +++ b/mesalib/src/mesa/main/scissor.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c index a60d8f38a..a62ad0413 100644 --- a/mesalib/src/mesa/main/shaderobj.c +++ b/mesalib/src/mesa/main/shaderobj.c @@ -283,6 +283,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx, ralloc_free(shProg->UniformStorage); shProg->NumUserUniformStorage = 0; shProg->UniformStorage = NULL; + shProg->UniformLocationBaseScale = 0; } if (shProg->UniformHash) { diff --git a/mesalib/src/mesa/main/shaderobj.h b/mesalib/src/mesa/main/shaderobj.h index a0dac5ec9..5ce85cfde 100644 --- a/mesalib/src/mesa/main/shaderobj.h +++ b/mesalib/src/mesa/main/shaderobj.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 2004-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c index 9f5624def..5ef88098f 100644 --- a/mesalib/src/mesa/main/shared.c +++ b/mesalib/src/mesa/main/shared.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/shared.h b/mesalib/src/mesa/main/shared.h index 3bec08765..ce9d90ddd 100644 --- a/mesalib/src/mesa/main/shared.h +++ b/mesalib/src/mesa/main/shared.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/simple_list.h b/mesalib/src/mesa/main/simple_list.h index 0ade52d71..903432dce 100644 --- a/mesalib/src/mesa/main/simple_list.h +++ b/mesalib/src/mesa/main/simple_list.h @@ -11,7 +11,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c index 1b927ca65..23926410b 100644 --- a/mesalib/src/mesa/main/state.c +++ b/mesalib/src/mesa/main/state.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/state.h b/mesalib/src/mesa/main/state.h index bc2406b4d..c57dc0edb 100644 --- a/mesalib/src/mesa/main/state.h +++ b/mesalib/src/mesa/main/state.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/stencil.c b/mesalib/src/mesa/main/stencil.c index 505703a3d..f65116abe 100644 --- a/mesalib/src/mesa/main/stencil.c +++ b/mesalib/src/mesa/main/stencil.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/stencil.h b/mesalib/src/mesa/main/stencil.h index f2f7d37c6..6480b2adc 100644 --- a/mesalib/src/mesa/main/stencil.h +++ b/mesalib/src/mesa/main/stencil.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c index 2391868a4..58859440c 100644 --- a/mesalib/src/mesa/main/texcompress.c +++ b/mesalib/src/mesa/main/texcompress.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * Copyright (c) 2008 VMware, Inc. diff --git a/mesalib/src/mesa/main/texcompress.h b/mesalib/src/mesa/main/texcompress.h index c27fc26c9..c6a6e873e 100644 --- a/mesalib/src/mesa/main/texcompress.h +++ b/mesalib/src/mesa/main/texcompress.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texcompress_cpal.h b/mesalib/src/mesa/main/texcompress_cpal.h index 8a8eac292..1b8542f08 100644 --- a/mesalib/src/mesa/main/texcompress_cpal.h +++ b/mesalib/src/mesa/main/texcompress_cpal.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.8 * * Copyright (C) 1999-2010 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texcompress_fxt1.c b/mesalib/src/mesa/main/texcompress_fxt1.c index 93bd19a9a..8d37d813f 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.c +++ b/mesalib/src/mesa/main/texcompress_fxt1.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texcompress_fxt1.h b/mesalib/src/mesa/main/texcompress_fxt1.h index 3a00de5ac..4f46d7765 100644 --- a/mesalib/src/mesa/main/texcompress_fxt1.h +++ b/mesalib/src/mesa/main/texcompress_fxt1.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c index 41ea33613..a815193b7 100644 --- a/mesalib/src/mesa/main/texcompress_s3tc.c +++ b/mesalib/src/mesa/main/texcompress_s3tc.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * Copyright (c) 2008 VMware, Inc. diff --git a/mesalib/src/mesa/main/texcompress_s3tc.h b/mesalib/src/mesa/main/texcompress_s3tc.h index fbc04c234..d8d8fbfc1 100644 --- a/mesalib/src/mesa/main/texcompress_s3tc.h +++ b/mesalib/src/mesa/main/texcompress_s3tc.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texenv.c b/mesalib/src/mesa/main/texenv.c index 84731ddda..1aadd7fde 100644 --- a/mesalib/src/mesa/main/texenv.c +++ b/mesalib/src/mesa/main/texenv.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/texenv.h b/mesalib/src/mesa/main/texenv.h index 5f71e276d..46a7ec4e2 100644 --- a/mesalib/src/mesa/main/texenv.h +++ b/mesalib/src/mesa/main/texenv.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texenvprogram.h b/mesalib/src/mesa/main/texenvprogram.h index aff404be0..15ab31a50 100644 --- a/mesalib/src/mesa/main/texenvprogram.h +++ b/mesalib/src/mesa/main/texenvprogram.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index 495a2048d..c2f925723 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/texformat.h b/mesalib/src/mesa/main/texformat.h index d6ff54173..88ad4d1a7 100644 --- a/mesalib/src/mesa/main/texformat.h +++ b/mesalib/src/mesa/main/texformat.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.75 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c index 81ad224a0..41e428b69 100644 --- a/mesalib/src/mesa/main/texgen.c +++ b/mesalib/src/mesa/main/texgen.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h index 3292258dc..aad5d2ecf 100644 --- a/mesalib/src/mesa/main/texgen.h +++ b/mesalib/src/mesa/main/texgen.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 70319c52b..4c672e366 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/texgetimage.h b/mesalib/src/mesa/main/texgetimage.h index 32c33fed4..91ae6e2e9 100644 --- a/mesalib/src/mesa/main/texgetimage.h +++ b/mesalib/src/mesa/main/texgetimage.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 9aaa63f13..5226687ff 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -798,7 +798,7 @@ _mesa_select_tex_object(struct gl_context *ctx, ctx->Extensions.ARB_texture_buffer_object ? texUnit->CurrentTex[TEXTURE_BUFFER_INDEX] : NULL; case GL_TEXTURE_EXTERNAL_OES: - return ctx->Extensions.OES_EGL_image_external + return _mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external ? texUnit->CurrentTex[TEXTURE_EXTERNAL_INDEX] : NULL; case GL_TEXTURE_2D_MULTISAMPLE: return ctx->Extensions.ARB_texture_multisample @@ -3243,7 +3243,8 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) valid_target = ctx->Extensions.OES_EGL_image; break; case GL_TEXTURE_EXTERNAL_OES: - valid_target = ctx->Extensions.OES_EGL_image_external; + valid_target = + _mesa_is_gles(ctx) ? ctx->Extensions.OES_EGL_image_external : false; break; default: valid_target = false; @@ -3428,6 +3429,35 @@ get_copy_tex_image_source(struct gl_context *ctx, gl_format texFormat) } } +static void +copytexsubimage_by_slice(struct gl_context *ctx, + struct gl_texture_image *texImage, + GLuint dims, + GLint xoffset, GLint yoffset, GLint zoffset, + struct gl_renderbuffer *rb, + GLint x, GLint y, + GLsizei width, GLsizei height) +{ + if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) { + int slice; + + /* For 1D arrays, we copy each scanline of the source rectangle into the + * next array slice. + */ + assert(zoffset == 0); + + for (slice = 0; slice < height; slice++) { + assert(yoffset + slice < texImage->Height); + ctx->Driver.CopyTexSubImage(ctx, 2, texImage, + xoffset, 0, yoffset + slice, + rb, x, y + slice, width, 1); + } + } else { + ctx->Driver.CopyTexSubImage(ctx, dims, texImage, + xoffset, yoffset, zoffset, + rb, x, y, width, height); + } +} /** @@ -3516,8 +3546,9 @@ copyteximage(struct gl_context *ctx, GLuint dims, struct gl_renderbuffer *srcRb = get_copy_tex_image_source(ctx, texImage->TexFormat); - ctx->Driver.CopyTexSubImage(ctx, dims, texImage, dstX, dstY, dstZ, - srcRb, srcX, srcY, width, height); + copytexsubimage_by_slice(ctx, texImage, dims, + dstX, dstY, dstZ, + srcRb, srcX, srcY, width, height); } check_gen_mipmap(ctx, target, texObj, level); @@ -3609,9 +3640,9 @@ copytexsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level, struct gl_renderbuffer *srcRb = get_copy_tex_image_source(ctx, texImage->TexFormat); - ctx->Driver.CopyTexSubImage(ctx, dims, texImage, - xoffset, yoffset, zoffset, - srcRb, x, y, width, height); + copytexsubimage_by_slice(ctx, texImage, dims, + xoffset, yoffset, zoffset, + srcRb, x, y, width, height); check_gen_mipmap(ctx, target, texObj, level); diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h index a0d71c9f8..889524718 100644 --- a/mesalib/src/mesa/main/teximage.h +++ b/mesalib/src/mesa/main/teximage.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index 27c040301..2168bffb1 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h index 622defa71..a99f45bfa 100644 --- a/mesalib/src/mesa/main/texobj.h +++ b/mesalib/src/mesa/main/texobj.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index b5a1e58e2..9507bc394 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/texparam.h b/mesalib/src/mesa/main/texparam.h index 32cefad22..557a7bcb4 100644 --- a/mesalib/src/mesa/main/texparam.h +++ b/mesalib/src/mesa/main/texparam.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c index afc9337ff..741985c46 100644 --- a/mesalib/src/mesa/main/texstate.c +++ b/mesalib/src/mesa/main/texstate.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h index 5c7fa8a31..5cd1684f2 100644 --- a/mesalib/src/mesa/main/texstate.h +++ b/mesalib/src/mesa/main/texstate.h @@ -5,7 +5,6 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c index daa024c80..9b66ad50b 100644 --- a/mesalib/src/mesa/main/texstore.c +++ b/mesalib/src/mesa/main/texstore.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. diff --git a/mesalib/src/mesa/main/texstore.h b/mesalib/src/mesa/main/texstore.h index f3d4a7d05..fbb3b2668 100644 --- a/mesalib/src/mesa/main/texstore.h +++ b/mesalib/src/mesa/main/texstore.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * Copyright (c) 2008 VMware, Inc. diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp index ec3104936..296f80f17 100644 --- a/mesalib/src/mesa/main/uniform_query.cpp +++ b/mesalib/src/mesa/main/uniform_query.cpp @@ -235,7 +235,7 @@ validate_uniform_parameters(struct gl_context *ctx, return false; } - _mesa_uniform_split_location_offset(location, loc, array_index); + _mesa_uniform_split_location_offset(shProg, location, loc, array_index); if (*loc >= shProg->NumUserUniformStorage) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index 6d79df683..17e62403d 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -538,7 +538,7 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) if (shProg->UniformStorage[index].block_index != -1) return -1; - return _mesa_uniform_merge_location_offset(index, offset); + return _mesa_uniform_merge_location_offset(shProg, index, offset); } GLuint GLAPIENTRY diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index 5ebd5e49a..14fe26d5f 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -269,20 +269,24 @@ struct gl_builtin_uniform_desc { * Combine the uniform's base location and the offset */ static inline GLint -_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) +_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, + unsigned base_location, unsigned offset) { - return (base_location << 16) | offset; + assert(prog->UniformLocationBaseScale >= 0); + assert(offset < prog->UniformLocationBaseScale); + return (base_location * prog->UniformLocationBaseScale) + offset; } /** * Separate the uniform base location and parameter offset */ static inline void -_mesa_uniform_split_location_offset(GLint location, unsigned *base_location, +_mesa_uniform_split_location_offset(const struct gl_shader_program *prog, + GLint location, unsigned *base_location, unsigned *offset) { - *offset = location & 0xffff; - *base_location = location >> 16; + *offset = location % prog->UniformLocationBaseScale; + *base_location = location / prog->UniformLocationBaseScale; } /*@}*/ diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index db0945e30..529d93324 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h index a178bc13c..7e611e8c7 100644 --- a/mesalib/src/mesa/main/varray.h +++ b/mesalib/src/mesa/main/varray.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/version.h b/mesalib/src/mesa/main/version.h index 19d321d9a..c78f87a2b 100644 --- a/mesalib/src/mesa/main/version.h +++ b/mesalib/src/mesa/main/version.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.11 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/viewport.c b/mesalib/src/mesa/main/viewport.c index c4d7f1e07..91578ba9d 100644 --- a/mesalib/src/mesa/main/viewport.c +++ b/mesalib/src/mesa/main/viewport.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/main/viewport.h b/mesalib/src/mesa/main/viewport.h index 77d8cbbfd..ffa3a729c 100644 --- a/mesalib/src/mesa/main/viewport.h +++ b/mesalib/src/mesa/main/viewport.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c index 8864b8cf5..336206f15 100644 --- a/mesalib/src/mesa/main/vtxfmt.c +++ b/mesalib/src/mesa/main/vtxfmt.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/main/vtxfmt.h b/mesalib/src/mesa/main/vtxfmt.h index 4301c4277..e738a41c2 100644 --- a/mesalib/src/mesa/main/vtxfmt.h +++ b/mesalib/src/mesa/main/vtxfmt.h @@ -7,7 +7,6 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_clip_tmp.h b/mesalib/src/mesa/math/m_clip_tmp.h index c6b8bd83d..5cfcf91dd 100644 --- a/mesalib/src/mesa/math/m_clip_tmp.h +++ b/mesalib/src/mesa/math/m_clip_tmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.2 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_copy_tmp.h b/mesalib/src/mesa/math/m_copy_tmp.h index 98fbd0730..dd174b229 100644 --- a/mesalib/src/mesa/math/m_copy_tmp.h +++ b/mesalib/src/mesa/math/m_copy_tmp.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_debug.h b/mesalib/src/mesa/math/m_debug.h index a1e8cee9d..59bb1552e 100644 --- a/mesalib/src/mesa/math/m_debug.h +++ b/mesalib/src/mesa/math/m_debug.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_debug_clip.c b/mesalib/src/mesa/math/m_debug_clip.c index 08b9eff06..cd8a90d4d 100644 --- a/mesalib/src/mesa/math/m_debug_clip.c +++ b/mesalib/src/mesa/math/m_debug_clip.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_debug_norm.c b/mesalib/src/mesa/math/m_debug_norm.c index 588cd90a3..db71ebef0 100644 --- a/mesalib/src/mesa/math/m_debug_norm.c +++ b/mesalib/src/mesa/math/m_debug_norm.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_debug_util.h b/mesalib/src/mesa/math/m_debug_util.h index f356588ae..d526e9656 100644 --- a/mesalib/src/mesa/math/m_debug_util.h +++ b/mesalib/src/mesa/math/m_debug_util.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_debug_xform.c b/mesalib/src/mesa/math/m_debug_xform.c index cea382da6..fbfa9b28a 100644 --- a/mesalib/src/mesa/math/m_debug_xform.c +++ b/mesalib/src/mesa/math/m_debug_xform.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_dotprod_tmp.h b/mesalib/src/mesa/math/m_dotprod_tmp.h index 6f530cfc4..cae809037 100644 --- a/mesalib/src/mesa/math/m_dotprod_tmp.h +++ b/mesalib/src/mesa/math/m_dotprod_tmp.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_eval.c b/mesalib/src/mesa/math/m_eval.c index 7e8a81d13..f0c7190b7 100644 --- a/mesalib/src/mesa/math/m_eval.c +++ b/mesalib/src/mesa/math/m_eval.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_eval.h b/mesalib/src/mesa/math/m_eval.h index cc1d1894c..18f4d7a42 100644 --- a/mesalib/src/mesa/math/m_eval.h +++ b/mesalib/src/mesa/math/m_eval.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_matrix.c b/mesalib/src/mesa/math/m_matrix.c index 4f64bd226..290231527 100644 --- a/mesalib/src/mesa/math/m_matrix.c +++ b/mesalib/src/mesa/math/m_matrix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_matrix.h b/mesalib/src/mesa/math/m_matrix.h index fabe15a94..2b097cb31 100644 --- a/mesalib/src/mesa/math/m_matrix.h +++ b/mesalib/src/mesa/math/m_matrix.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_norm_tmp.h b/mesalib/src/mesa/math/m_norm_tmp.h index 24839e2b5..339c03ff8 100644 --- a/mesalib/src/mesa/math/m_norm_tmp.h +++ b/mesalib/src/mesa/math/m_norm_tmp.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_trans_tmp.h b/mesalib/src/mesa/math/m_trans_tmp.h index 867384b78..f39a3c83a 100644 --- a/mesalib/src/mesa/math/m_trans_tmp.h +++ b/mesalib/src/mesa/math/m_trans_tmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_translate.c b/mesalib/src/mesa/math/m_translate.c index 40c817463..0b8c858d7 100644 --- a/mesalib/src/mesa/math/m_translate.c +++ b/mesalib/src/mesa/math/m_translate.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_translate.h b/mesalib/src/mesa/math/m_translate.h index eeb947f29..250921a3f 100644 --- a/mesalib/src/mesa/math/m_translate.h +++ b/mesalib/src/mesa/math/m_translate.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_vector.c b/mesalib/src/mesa/math/m_vector.c index 0d38117e9..ff42396b7 100644 --- a/mesalib/src/mesa/math/m_vector.c +++ b/mesalib/src/mesa/math/m_vector.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_vector.h b/mesalib/src/mesa/math/m_vector.h index 143a30282..8551ee752 100644 --- a/mesalib/src/mesa/math/m_vector.h +++ b/mesalib/src/mesa/math/m_vector.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_xform.c b/mesalib/src/mesa/math/m_xform.c index f8c0993d4..14d1c6453 100644 --- a/mesalib/src/mesa/math/m_xform.c +++ b/mesalib/src/mesa/math/m_xform.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_xform.h b/mesalib/src/mesa/math/m_xform.h index 7cec7f0ad..e45880322 100644 --- a/mesalib/src/mesa/math/m_xform.h +++ b/mesalib/src/mesa/math/m_xform.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/math/m_xform_tmp.h b/mesalib/src/mesa/math/m_xform_tmp.h index 1f984887d..8886c9646 100644 --- a/mesalib/src/mesa/math/m_xform_tmp.h +++ b/mesalib/src/mesa/math/m_xform_tmp.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/arbprogparse.c b/mesalib/src/mesa/program/arbprogparse.c index 0ec87e356..5b9665091 100644 --- a/mesalib/src/mesa/program/arbprogparse.c +++ b/mesalib/src/mesa/program/arbprogparse.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/arbprogparse.h b/mesalib/src/mesa/program/arbprogparse.h index 04d304bc0..39d2116a0 100644 --- a/mesalib/src/mesa/program/arbprogparse.h +++ b/mesalib/src/mesa/program/arbprogparse.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c index 548077d39..b902006ef 100644 --- a/mesalib/src/mesa/program/prog_execute.c +++ b/mesalib/src/mesa/program/prog_execute.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_execute.h b/mesalib/src/mesa/program/prog_execute.h index 346b7b6b3..09542bfa2 100644 --- a/mesalib/src/mesa/program/prog_execute.h +++ b/mesalib/src/mesa/program/prog_execute.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_instruction.c b/mesalib/src/mesa/program/prog_instruction.c index 4329e6544..dcfedb77b 100644 --- a/mesalib/src/mesa/program/prog_instruction.c +++ b/mesalib/src/mesa/program/prog_instruction.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 1999-2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h index 160b1d079..be221819f 100644 --- a/mesalib/src/mesa/program/prog_instruction.h +++ b/mesalib/src/mesa/program/prog_instruction.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_noise.c b/mesalib/src/mesa/program/prog_noise.c index 63590c60c..c258c5e2e 100644 --- a/mesalib/src/mesa/program/prog_noise.c +++ b/mesalib/src/mesa/program/prog_noise.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_noise.h b/mesalib/src/mesa/program/prog_noise.h index 9828343a6..51124ca1d 100644 --- a/mesalib/src/mesa/program/prog_noise.h +++ b/mesalib/src/mesa/program/prog_noise.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_optimize.c b/mesalib/src/mesa/program/prog_optimize.c index c1013a5a2..6153f5e2c 100644 --- a/mesalib/src/mesa/program/prog_optimize.c +++ b/mesalib/src/mesa/program/prog_optimize.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_optimize.h b/mesalib/src/mesa/program/prog_optimize.h index 9854fb7a4..7607bffdd 100644 --- a/mesalib/src/mesa/program/prog_optimize.h +++ b/mesalib/src/mesa/program/prog_optimize.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 2009 VMware, Inc. All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_parameter.c b/mesalib/src/mesa/program/prog_parameter.c index 0b134f7da..95b153e16 100644 --- a/mesalib/src/mesa/program/prog_parameter.c +++ b/mesalib/src/mesa/program/prog_parameter.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_parameter.h b/mesalib/src/mesa/program/prog_parameter.h index bb2aa973b..6b3b3c262 100644 --- a/mesalib/src/mesa/program/prog_parameter.h +++ b/mesalib/src/mesa/program/prog_parameter.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_print.c b/mesalib/src/mesa/program/prog_print.c index c8351e3b5..cf852132d 100644 --- a/mesalib/src/mesa/program/prog_print.c +++ b/mesalib/src/mesa/program/prog_print.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/program/prog_print.h b/mesalib/src/mesa/program/prog_print.h index 82195cbbc..cd61568e9 100644 --- a/mesalib/src/mesa/program/prog_print.h +++ b/mesalib/src/mesa/program/prog_print.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c index 19a948237..f6073be13 100644 --- a/mesalib/src/mesa/program/prog_statevars.c +++ b/mesalib/src/mesa/program/prog_statevars.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/prog_statevars.h b/mesalib/src/mesa/program/prog_statevars.h index e26ded9e0..ec22b7376 100644 --- a/mesalib/src/mesa/program/prog_statevars.h +++ b/mesalib/src/mesa/program/prog_statevars.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c index 37bb7b7eb..2529c1305 100644 --- a/mesalib/src/mesa/program/program.c +++ b/mesalib/src/mesa/program/program.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/program.h b/mesalib/src/mesa/program/program.h index 8f88b3913..ecda59b58 100644 --- a/mesalib/src/mesa/program/program.h +++ b/mesalib/src/mesa/program/program.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/programopt.c b/mesalib/src/mesa/program/programopt.c index 6a62e1f58..7e0057223 100644 --- a/mesalib/src/mesa/program/programopt.c +++ b/mesalib/src/mesa/program/programopt.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/program/programopt.h b/mesalib/src/mesa/program/programopt.h index 3a274417f..f22109fb4 100644 --- a/mesalib/src/mesa/program/programopt.h +++ b/mesalib/src/mesa/program/programopt.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/state_tracker/st_atom_shader.c b/mesalib/src/mesa/state_tracker/st_atom_shader.c index c0239e929..e22899729 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_shader.c +++ b/mesalib/src/mesa/state_tracker/st_atom_shader.c @@ -60,7 +60,8 @@ get_passthrough_fs(struct st_context *st) if (!st->passthrough_fs) { st->passthrough_fs = util_make_fragment_passthrough_shader(st->pipe, TGSI_SEMANTIC_COLOR, - TGSI_INTERPOLATE_PERSPECTIVE); + TGSI_INTERPOLATE_PERSPECTIVE, + TRUE); } return st->passthrough_fs; diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 566f4a76e..b8e2fad25 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -99,7 +99,8 @@ set_fragment_shader(struct st_context *st) if (!st->clear.fs) st->clear.fs = util_make_fragment_passthrough_shader(st->pipe, TGSI_SEMANTIC_GENERIC, - TGSI_INTERPOLATE_CONSTANT); + TGSI_INTERPOLATE_CONSTANT, + TRUE); cso_set_fragment_shader_handle(st->cso_context, st->clear.fs); } diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 68359e803..0200a6270 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -460,12 +460,12 @@ internal_format(struct gl_context *ctx, GLenum format, GLenum type) */ static struct pipe_resource * alloc_texture(struct st_context *st, GLsizei width, GLsizei height, - enum pipe_format texFormat) + enum pipe_format texFormat, unsigned bind) { struct pipe_resource *pt; pt = st_texture_create(st, st->internal_target, texFormat, 0, - width, height, 1, 1, 0, PIPE_BIND_SAMPLER_VIEW); + width, height, 1, 1, 0, bind); return pt; } @@ -515,7 +515,7 @@ make_texture(struct st_context *st, return NULL; /* alloc temporary texture */ - pt = alloc_texture(st, width, height, pipeFormat); + pt = alloc_texture(st, width, height, pipeFormat, PIPE_BIND_SAMPLER_VIEW); if (!pt) { _mesa_unmap_pbo_source(ctx, unpack); return NULL; @@ -1308,29 +1308,38 @@ st_get_color_read_renderbuffer(struct gl_context *ctx) } -/** Do the src/dest regions overlap? */ -static GLboolean -regions_overlap(GLint srcX, GLint srcY, GLint dstX, GLint dstY, - GLsizei width, GLsizei height) +/** + * \return TRUE if two regions overlap, FALSE otherwise + */ +static boolean +regions_overlap(int srcX0, int srcY0, + int srcX1, int srcY1, + int dstX0, int dstY0, + int dstX1, int dstY1) { - if (srcX + width <= dstX || - dstX + width <= srcX || - srcY + height <= dstY || - dstY + height <= srcY) - return GL_FALSE; - else - return GL_TRUE; + if (MAX2(srcX0, srcX1) < MIN2(dstX0, dstX1)) + return FALSE; /* src completely left of dst */ + + if (MAX2(dstX0, dstX1) < MIN2(srcX0, srcX1)) + return FALSE; /* dst completely left of src */ + + if (MAX2(srcY0, srcY1) < MIN2(dstY0, dstY1)) + return FALSE; /* src completely above dst */ + + if (MAX2(dstY0, dstY1) < MIN2(srcY0, srcY1)) + return FALSE; /* dst completely above src */ + + return TRUE; /* some overlap */ } /** * Try to do a glCopyPixels for simple cases with a blit by calling - * pipe->resource_copy_region(). + * pipe->blit(). * * We can do this when we're copying color pixels (depth/stencil * eventually) with no pixel zoom, no pixel transfer ops, no - * per-fragment ops, the src/dest regions don't overlap and the - * src/dest pixel formats are the same. + * per-fragment ops, and the src/dest regions don't overlap. */ static GLboolean blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, @@ -1339,8 +1348,9 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, { struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; + struct pipe_screen *screen = pipe->screen; struct gl_pixelstore_attrib pack, unpack; - GLint readX, readY, readW, readH; + GLint readX, readY, readW, readH, drawX, drawY, drawW, drawH; if (type == GL_COLOR && ctx->Pixel.ZoomX == 1.0 && @@ -1354,11 +1364,10 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, !ctx->FragmentProgram.Enabled && !ctx->VertexProgram.Enabled && !ctx->Shader.CurrentFragmentProgram && - st_fb_orientation(ctx->ReadBuffer) == st_fb_orientation(ctx->DrawBuffer) && ctx->DrawBuffer->_NumColorDrawBuffers == 1 && - !ctx->Query.CondRenderQuery) { + !ctx->Query.CondRenderQuery && + !ctx->Query.CurrentOcclusionObject) { struct st_renderbuffer *rbRead, *rbDraw; - GLint drawX, drawY; /* * Clip the read region against the src buffer bounds. @@ -1385,29 +1394,65 @@ blit_copy_pixels(struct gl_context *ctx, GLint srcx, GLint srcy, readX = readX - pack.SkipPixels + unpack.SkipPixels; readY = readY - pack.SkipRows + unpack.SkipRows; + drawW = readW; + drawH = readH; + rbRead = st_get_color_read_renderbuffer(ctx); rbDraw = st_renderbuffer(ctx->DrawBuffer->_ColorDrawBuffers[0]); - if ((rbRead != rbDraw || - !regions_overlap(readX, readY, drawX, drawY, readW, readH)) && - rbRead->Base.Format == rbDraw->Base.Format) { - struct pipe_box srcBox; - - /* flip src/dst position if needed */ - if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) { - /* both buffers will have the same orientation */ - readY = ctx->ReadBuffer->Height - readY - readH; - drawY = ctx->DrawBuffer->Height - drawY - readH; - } + /* Flip src/dst position depending on the orientation of buffers. */ + if (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP) { + readY = rbRead->Base.Height - readY; + readH = -readH; + } - u_box_2d(readX, readY, readW, readH, &srcBox); + if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP) { + /* We can't flip the destination for pipe->blit, so we only adjust + * its position and flip the source. + */ + drawY = rbDraw->Base.Height - drawY - drawH; + readY += readH; + readH = -readH; + } - pipe->resource_copy_region(pipe, - rbDraw->texture, - rbDraw->rtt_level, drawX, drawY, 0, - rbRead->texture, - rbRead->rtt_level, &srcBox); - return GL_TRUE; + if (rbRead != rbDraw || + !regions_overlap(readX, readY, readX + readW, readY + readH, + drawX, drawY, drawX + drawW, drawY + drawH)) { + struct pipe_blit_info blit; + + memset(&blit, 0, sizeof(blit)); + blit.src.resource = rbRead->texture; + blit.src.level = rbRead->rtt_level; + blit.src.format = rbRead->texture->format; + blit.src.box.x = readX; + blit.src.box.y = readY; + blit.src.box.z = rbRead->rtt_face + rbRead->rtt_slice; + blit.src.box.width = readW; + blit.src.box.height = readH; + blit.src.box.depth = 1; + blit.dst.resource = rbDraw->texture; + blit.dst.level = rbDraw->rtt_level; + blit.dst.format = rbDraw->texture->format; + blit.dst.box.x = drawX; + blit.dst.box.y = drawY; + blit.dst.box.z = rbDraw->rtt_face + rbDraw->rtt_slice; + blit.dst.box.width = drawW; + blit.dst.box.height = drawH; + blit.dst.box.depth = 1; + blit.mask = PIPE_MASK_RGBA; + blit.filter = PIPE_TEX_FILTER_NEAREST; + + if (screen->is_format_supported(screen, blit.src.format, + blit.src.resource->target, + blit.src.resource->nr_samples, + PIPE_BIND_SAMPLER_VIEW) && + screen->is_format_supported(screen, blit.dst.format, + blit.dst.resource->target, + blit.dst.resource->nr_samples, + PIPE_BIND_RENDER_TARGET)) { + pipe->blit(pipe, &blit); + return GL_TRUE; + } } } @@ -1429,10 +1474,10 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, struct pipe_sampler_view *sv[2]; int num_sampler_view = 1; GLfloat *color; - enum pipe_format srcFormat, texFormat; + enum pipe_format srcFormat; + unsigned srcBind; GLboolean invertTex = GL_FALSE; GLint readX, readY, readW, readH; - GLuint sample_count; struct gl_pixelstore_attrib pack = ctx->DefaultPacking; struct st_fp_variant *fpv; @@ -1494,35 +1539,46 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, /* update fragment program constants */ st_upload_constants(st, fpv->parameters, PIPE_SHADER_FRAGMENT); - sample_count = rbRead->texture->nr_samples; - /* I believe this would be legal, presumably would need to do a resolve - for color, and for depth/stencil spec says to just use one of the - depth/stencil samples per pixel? Need some transfer clarifications. */ - assert(sample_count < 2); - + /* Choose the format for the temporary texture. */ srcFormat = rbRead->texture->format; + srcBind = PIPE_BIND_SAMPLER_VIEW | + (type == GL_COLOR ? PIPE_BIND_RENDER_TARGET : PIPE_BIND_DEPTH_STENCIL); - if (screen->is_format_supported(screen, srcFormat, st->internal_target, - sample_count, - PIPE_BIND_SAMPLER_VIEW)) { - texFormat = srcFormat; - } - else { - /* srcFormat can't be used as a texture format */ + if (!screen->is_format_supported(screen, srcFormat, st->internal_target, 0, + srcBind)) { if (type == GL_DEPTH) { - texFormat = st_choose_format(st, GL_DEPTH_COMPONENT, - GL_NONE, GL_NONE, st->internal_target, - sample_count, PIPE_BIND_DEPTH_STENCIL, - FALSE); - assert(texFormat != PIPE_FORMAT_NONE); + srcFormat = st_choose_format(st, GL_DEPTH_COMPONENT, GL_NONE, + GL_NONE, st->internal_target, 0, + srcBind, FALSE); } else { - /* default color format */ - texFormat = st_choose_format(st, GL_RGBA, - GL_NONE, GL_NONE, st->internal_target, - sample_count, PIPE_BIND_SAMPLER_VIEW, - FALSE); - assert(texFormat != PIPE_FORMAT_NONE); + assert(type == GL_COLOR); + + if (util_format_is_float(srcFormat)) { + srcFormat = st_choose_format(st, GL_RGBA32F, GL_NONE, + GL_NONE, st->internal_target, 0, + srcBind, FALSE); + } + else if (util_format_is_pure_sint(srcFormat)) { + srcFormat = st_choose_format(st, GL_RGBA32I, GL_NONE, + GL_NONE, st->internal_target, 0, + srcBind, FALSE); + } + else if (util_format_is_pure_uint(srcFormat)) { + srcFormat = st_choose_format(st, GL_RGBA32UI, GL_NONE, + GL_NONE, st->internal_target, 0, + srcBind, FALSE); + } + else { + srcFormat = st_choose_format(st, GL_RGBA, GL_NONE, + GL_NONE, st->internal_target, 0, + srcBind, FALSE); + } + } + + if (srcFormat == PIPE_FORMAT_NONE) { + assert(0 && "cannot choose a format for src of CopyPixels"); + return; } } @@ -1554,8 +1610,8 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, readW = MAX2(0, readW); readH = MAX2(0, readH); - /* alloc temporary texture */ - pt = alloc_texture(st, width, height, texFormat); + /* Allocate the temporary texture. */ + pt = alloc_texture(st, width, height, srcFormat, srcBind); if (!pt) return; @@ -1565,70 +1621,33 @@ st_CopyPixels(struct gl_context *ctx, GLint srcx, GLint srcy, return; } - /* Make temporary texture which is a copy of the src region. - */ - if (srcFormat == texFormat) { - struct pipe_box src_box; - u_box_2d(readX, readY, readW, readH, &src_box); - /* copy source framebuffer surface into mipmap/texture */ - pipe->resource_copy_region(pipe, - pt, /* dest tex */ - 0, /* dest lvl */ - pack.SkipPixels, pack.SkipRows, 0, /* dest pos */ - rbRead->texture, /* src tex */ - rbRead->rtt_level, /* src lvl */ - &src_box); - - } - else { - /* CPU-based fallback/conversion */ - struct pipe_transfer *ptRead; - void *mapRead = - pipe_transfer_map(st->pipe, rbRead->texture, - rbRead->rtt_level, - rbRead->rtt_face + rbRead->rtt_slice, - PIPE_TRANSFER_READ, - readX, readY, readW, readH, &ptRead); - struct pipe_transfer *ptTex; - void *mapTex; - enum pipe_transfer_usage transfer_usage; - - if (ST_DEBUG & DEBUG_FALLBACK) - debug_printf("%s: fallback processing\n", __FUNCTION__); - - if (type == GL_DEPTH && util_format_is_depth_and_stencil(pt->format)) - transfer_usage = PIPE_TRANSFER_READ_WRITE; - else - transfer_usage = PIPE_TRANSFER_WRITE; - - mapTex = pipe_transfer_map(st->pipe, pt, 0, 0, transfer_usage, - 0, 0, width, height, &ptTex); - - /* copy image from ptRead surface to ptTex surface */ - if (type == GL_COLOR) { - /* alternate path using get/put_tile() */ - GLfloat *buf = malloc(width * height * 4 * sizeof(GLfloat)); - enum pipe_format readFormat, drawFormat; - readFormat = util_format_linear(rbRead->texture->format); - drawFormat = util_format_linear(pt->format); - pipe_get_tile_rgba_format(ptRead, mapRead, 0, 0, readW, readH, - readFormat, buf); - pipe_put_tile_rgba_format(ptTex, mapTex, pack.SkipPixels, - pack.SkipRows, - readW, readH, drawFormat, buf); - free(buf); - } - else { - /* GL_DEPTH */ - GLuint *buf = malloc(width * height * sizeof(GLuint)); - pipe_get_tile_z(ptRead, mapRead, 0, 0, readW, readH, buf); - pipe_put_tile_z(ptTex, mapTex, pack.SkipPixels, pack.SkipRows, - readW, readH, buf); - free(buf); - } - - pipe->transfer_unmap(pipe, ptRead); - pipe->transfer_unmap(pipe, ptTex); + /* Copy the src region to the temporary texture. */ + { + struct pipe_blit_info blit; + + memset(&blit, 0, sizeof(blit)); + blit.src.resource = rbRead->texture; + blit.src.level = rbRead->rtt_level; + blit.src.format = rbRead->texture->format; + blit.src.box.x = readX; + blit.src.box.y = readY; + blit.src.box.z = rbRead->rtt_face + rbRead->rtt_slice; + blit.src.box.width = readW; + blit.src.box.height = readH; + blit.src.box.depth = 1; + blit.dst.resource = pt; + blit.dst.level = 0; + blit.dst.format = pt->format; + blit.dst.box.x = pack.SkipPixels; + blit.dst.box.y = pack.SkipRows; + blit.dst.box.z = 0; + blit.dst.box.width = readW; + blit.dst.box.height = readH; + blit.dst.box.depth = 1; + blit.mask = util_format_get_mask(pt->format) & ~PIPE_MASK_S; + blit.filter = PIPE_TEX_FILTER_NEAREST; + + pipe->blit(pipe, &blit); } /* OK, the texture 'pt' contains the src image/pixels. Now draw a diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c index a396b9e97..b871cdd19 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c +++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.h b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h index c6ddec6ae..9d8224a56 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_eglimage.h +++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index 56dbe85c0..68c334ed8 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -1133,7 +1133,7 @@ fallback_copy_texsubimage(struct gl_context *ctx, struct st_renderbuffer *strb, struct st_texture_image *stImage, GLenum baseFormat, - GLint destX, GLint destY, GLint destZ, + GLint destX, GLint destY, GLint slice, GLint srcX, GLint srcY, GLsizei width, GLsizei height) { @@ -1154,14 +1154,6 @@ fallback_copy_texsubimage(struct gl_context *ctx, srcY = strb->Base.Height - srcY - height; } - if (stImage->pt->target == PIPE_TEXTURE_1D_ARRAY) { - /* Move y/height to z/depth for 1D array textures. */ - destZ = destY; - destY = 0; - dst_depth = dst_height; - dst_height = 1; - } - map = pipe_transfer_map(pipe, strb->texture, strb->rtt_level, @@ -1178,7 +1170,7 @@ fallback_copy_texsubimage(struct gl_context *ctx, transfer_usage = PIPE_TRANSFER_WRITE; texDest = st_texture_image_map(st, stImage, transfer_usage, - destX, destY, destZ, + destX, destY, slice, dst_width, dst_height, dst_depth); if (baseFormat == GL_DEPTH_COMPONENT || @@ -1292,7 +1284,7 @@ fallback_copy_texsubimage(struct gl_context *ctx, static void st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, struct gl_texture_image *texImage, - GLint destX, GLint destY, GLint destZ, + GLint destX, GLint destY, GLint slice, struct gl_renderbuffer *rb, GLint srcX, GLint srcY, GLsizei width, GLsizei height) { @@ -1306,7 +1298,7 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, enum pipe_format dst_format; GLboolean do_flip = (st_fb_orientation(ctx->ReadBuffer) == Y_0_TOP); unsigned bind; - GLint srcY0, srcY1, yStep; + GLint srcY0, srcY1; if (!strb || !strb->surface || !stImage->pt) { debug_printf("%s: null strb or stImage\n", __FUNCTION__); @@ -1351,12 +1343,10 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, if (do_flip) { srcY1 = strb->Base.Height - srcY - height; srcY0 = srcY1 + height; - yStep = -1; } else { srcY0 = srcY; srcY1 = srcY0 + height; - yStep = 1; } /* Blit the texture. @@ -1377,39 +1367,20 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims, blit.dst.level = stObj->pt != stImage->pt ? 0 : texImage->Level; blit.dst.box.x = destX; blit.dst.box.y = destY; - blit.dst.box.z = stImage->base.Face + destZ; + blit.dst.box.z = stImage->base.Face + slice; blit.dst.box.width = width; blit.dst.box.height = height; blit.dst.box.depth = 1; blit.mask = st_get_blit_mask(rb->_BaseFormat, texImage->_BaseFormat); blit.filter = PIPE_TEX_FILTER_NEAREST; - - /* 1D array textures need special treatment. - * Blit rows from the source to layers in the destination. */ - if (texImage->TexObject->Target == GL_TEXTURE_1D_ARRAY) { - int y, layer; - - for (y = srcY0, layer = 0; layer < height; y += yStep, layer++) { - blit.src.box.y = y; - blit.src.box.height = 1; - blit.dst.box.y = 0; - blit.dst.box.height = 1; - blit.dst.box.z = destY + layer; - - pipe->blit(pipe, &blit); - } - } - else { - /* All the other texture targets. */ - pipe->blit(pipe, &blit); - } + pipe->blit(pipe, &blit); return; fallback: /* software fallback */ fallback_copy_texsubimage(ctx, strb, stImage, texImage->_BaseFormat, - destX, destY, destZ, + destX, destY, slice, srcX, srcY, width, height); } diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c index b19d913e5..1ac9585e7 100644 --- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c +++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c @@ -40,6 +40,7 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" +#include "util/u_draw.h" #include "draw/draw_private.h" #include "draw/draw_context.h" @@ -81,6 +82,27 @@ set_feedback_vertex_format(struct gl_context *ctx) /** + * Helper for drawing current vertex arrays. + */ +static void +draw_arrays(struct draw_context *draw, unsigned mode, + unsigned start, unsigned count) +{ + struct pipe_draw_info info; + + util_draw_init_info(&info); + + info.mode = mode; + info.start = start; + info.count = count; + info.min_index = start; + info.max_index = start + count - 1; + + draw_vbo(draw, &info); +} + + +/** * Called by VBO to draw arrays when in selection or feedback mode and * to implement glRasterPos. * This is very much like the normal draw_vbo() function above. diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 46acc8763..966722c0b 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -187,7 +187,8 @@ void st_init_limits(struct st_context *st) pc->MaxTemps = pc->MaxNativeTemps = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_TEMPS); pc->MaxAddressRegs = pc->MaxNativeAddressRegs = - screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS); + _min(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_ADDRS), + MAX_PROGRAM_ADDRESS_REGS); pc->MaxParameters = pc->MaxNativeParameters = screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_CONSTS); @@ -572,8 +573,7 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.NV_texture_rectangle = GL_TRUE; ctx->Extensions.OES_EGL_image = GL_TRUE; - if (ctx->API != API_OPENGL_COMPAT) - ctx->Extensions.OES_EGL_image_external = GL_TRUE; + ctx->Extensions.OES_EGL_image_external = GL_TRUE; ctx->Extensions.OES_draw_texture = GL_TRUE; /* Expose the extensions which directly correspond to gallium caps. */ diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index f8176eb77..d6796d7a1 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -3096,7 +3096,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx, "Couldn't find uniform for initializer %s\n", name); return; } - int loc = _mesa_uniform_merge_location_offset(index, offset); + int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset); for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) { ir_constant *element; diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index 9e537f3c4..ec876087c 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mesa/state_tracker/st_manager.h b/mesalib/src/mesa/state_tracker/st_manager.h index f729cff1f..bbb9b0f64 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.h +++ b/mesalib/src/mesa/state_tracker/st_manager.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.9 * * Copyright (C) 2010 LunarG Inc. * diff --git a/mesalib/src/mesa/swrast/s_aaline.c b/mesalib/src/mesa/swrast/s_aaline.c index 6729c53fc..b4e05ff80 100644 --- a/mesalib/src/mesa/swrast/s_aaline.c +++ b/mesalib/src/mesa/swrast/s_aaline.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_aaline.h b/mesalib/src/mesa/swrast/s_aaline.h index 8ff1d7da3..6f21563d3 100644 --- a/mesalib/src/mesa/swrast/s_aaline.h +++ b/mesalib/src/mesa/swrast/s_aaline.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_aalinetemp.h b/mesalib/src/mesa/swrast/s_aalinetemp.h index 26efaa3e2..670b663bd 100644 --- a/mesalib/src/mesa/swrast/s_aalinetemp.h +++ b/mesalib/src/mesa/swrast/s_aalinetemp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_aatriangle.c b/mesalib/src/mesa/swrast/s_aatriangle.c index 02d49b9bd..d670d3154 100644 --- a/mesalib/src/mesa/swrast/s_aatriangle.c +++ b/mesalib/src/mesa/swrast/s_aatriangle.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_aatriangle.h b/mesalib/src/mesa/swrast/s_aatriangle.h index b5df414d9..2386b1a3c 100644 --- a/mesalib/src/mesa/swrast/s_aatriangle.h +++ b/mesalib/src/mesa/swrast/s_aatriangle.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_aatritemp.h b/mesalib/src/mesa/swrast/s_aatritemp.h index a400364d3..fd374a524 100644 --- a/mesalib/src/mesa/swrast/s_aatritemp.h +++ b/mesalib/src/mesa/swrast/s_aatritemp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_alpha.c b/mesalib/src/mesa/swrast/s_alpha.c index 3f12552fd..fba143a52 100644 --- a/mesalib/src/mesa/swrast/s_alpha.c +++ b/mesalib/src/mesa/swrast/s_alpha.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_alpha.h b/mesalib/src/mesa/swrast/s_alpha.h index 6c8728daa..cc1126202 100644 --- a/mesalib/src/mesa/swrast/s_alpha.h +++ b/mesalib/src/mesa/swrast/s_alpha.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_atifragshader.h b/mesalib/src/mesa/swrast/s_atifragshader.h index 10aaaa592..ac866aa6d 100644 --- a/mesalib/src/mesa/swrast/s_atifragshader.h +++ b/mesalib/src/mesa/swrast/s_atifragshader.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2003 David Airlie All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_bitmap.c b/mesalib/src/mesa/swrast/s_bitmap.c index 6d397da86..e364ec129 100644 --- a/mesalib/src/mesa/swrast/s_bitmap.c +++ b/mesalib/src/mesa/swrast/s_bitmap.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_blend.c b/mesalib/src/mesa/swrast/s_blend.c index 4423d5b17..1037b6236 100644 --- a/mesalib/src/mesa/swrast/s_blend.c +++ b/mesalib/src/mesa/swrast/s_blend.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_blend.h b/mesalib/src/mesa/swrast/s_blend.h index 32f921352..b77ec22c9 100644 --- a/mesalib/src/mesa/swrast/s_blend.h +++ b/mesalib/src/mesa/swrast/s_blend.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c index 0c8cfe551..bbb0013e6 100644 --- a/mesalib/src/mesa/swrast/s_blit.c +++ b/mesalib/src/mesa/swrast/s_blit.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_clear.c b/mesalib/src/mesa/swrast/s_clear.c index 58b36e8a2..c26b4be0d 100644 --- a/mesalib/src/mesa/swrast/s_clear.c +++ b/mesalib/src/mesa/swrast/s_clear.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c index 70bbb83dc..8934088df 100644 --- a/mesalib/src/mesa/swrast/s_context.c +++ b/mesalib/src/mesa/swrast/s_context.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_context.h b/mesalib/src/mesa/swrast/s_context.h index 9520185b2..eec711f51 100644 --- a/mesalib/src/mesa/swrast/s_context.h +++ b/mesalib/src/mesa/swrast/s_context.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_copypix.c b/mesalib/src/mesa/swrast/s_copypix.c index 57bdce0d2..d00173476 100644 --- a/mesalib/src/mesa/swrast/s_copypix.c +++ b/mesalib/src/mesa/swrast/s_copypix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_depth.c b/mesalib/src/mesa/swrast/s_depth.c index 4d2a6bd36..0f4fb9506 100644 --- a/mesalib/src/mesa/swrast/s_depth.c +++ b/mesalib/src/mesa/swrast/s_depth.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * @@ -311,6 +310,12 @@ _swrast_depth_test_span(struct gl_context *ctx, SWspan *span) zBufferVals = zStart; } else { + if (_mesa_get_format_datatype(rb->Format) != GL_UNSIGNED_NORMALIZED) { + _mesa_problem(ctx, "Incorrectly writing swrast's integer depth " + "values to %s depth buffer", + _mesa_get_format_name(rb->Format)); + } + /* copy Z buffer values into temp buffer (32-bit Z values) */ zBufferTemp = malloc(count * sizeof(GLuint)); if (!zBufferTemp) diff --git a/mesalib/src/mesa/swrast/s_depth.h b/mesalib/src/mesa/swrast/s_depth.h index 987c7af2b..b4b738c3b 100644 --- a/mesalib/src/mesa/swrast/s_depth.h +++ b/mesalib/src/mesa/swrast/s_depth.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_drawpix.c b/mesalib/src/mesa/swrast/s_drawpix.c index 41b50ab71..1786de1a3 100644 --- a/mesalib/src/mesa/swrast/s_drawpix.c +++ b/mesalib/src/mesa/swrast/s_drawpix.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_feedback.c b/mesalib/src/mesa/swrast/s_feedback.c index 67d84753e..f25b89735 100644 --- a/mesalib/src/mesa/swrast/s_feedback.c +++ b/mesalib/src/mesa/swrast/s_feedback.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_feedback.h b/mesalib/src/mesa/swrast/s_feedback.h index 62b9a38d6..b031669ac 100644 --- a/mesalib/src/mesa/swrast/s_feedback.h +++ b/mesalib/src/mesa/swrast/s_feedback.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_fog.c b/mesalib/src/mesa/swrast/s_fog.c index 1a2ef1d50..34b7c2d28 100644 --- a/mesalib/src/mesa/swrast/s_fog.c +++ b/mesalib/src/mesa/swrast/s_fog.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_fog.h b/mesalib/src/mesa/swrast/s_fog.h index d4d31e4f5..0afeb823e 100644 --- a/mesalib/src/mesa/swrast/s_fog.h +++ b/mesalib/src/mesa/swrast/s_fog.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 4.1 * * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_fragprog.c b/mesalib/src/mesa/swrast/s_fragprog.c index e7e1b8582..4e9ac394e 100644 --- a/mesalib/src/mesa/swrast/s_fragprog.c +++ b/mesalib/src/mesa/swrast/s_fragprog.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_fragprog.h b/mesalib/src/mesa/swrast/s_fragprog.h index 0522c6c7f..1ee201e50 100644 --- a/mesalib/src/mesa/swrast/s_fragprog.h +++ b/mesalib/src/mesa/swrast/s_fragprog.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_lines.c b/mesalib/src/mesa/swrast/s_lines.c index 72c41369b..b63296aa4 100644 --- a/mesalib/src/mesa/swrast/s_lines.c +++ b/mesalib/src/mesa/swrast/s_lines.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_lines.h b/mesalib/src/mesa/swrast/s_lines.h index 3d4453eb8..add72b885 100644 --- a/mesalib/src/mesa/swrast/s_lines.h +++ b/mesalib/src/mesa/swrast/s_lines.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_linetemp.h b/mesalib/src/mesa/swrast/s_linetemp.h index f3ce6d95e..7b1eac36a 100644 --- a/mesalib/src/mesa/swrast/s_linetemp.h +++ b/mesalib/src/mesa/swrast/s_linetemp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_logic.c b/mesalib/src/mesa/swrast/s_logic.c index a111f6337..f68273fd2 100644 --- a/mesalib/src/mesa/swrast/s_logic.c +++ b/mesalib/src/mesa/swrast/s_logic.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_logic.h b/mesalib/src/mesa/swrast/s_logic.h index b5e11fbf8..bcb4b74a0 100644 --- a/mesalib/src/mesa/swrast/s_logic.h +++ b/mesalib/src/mesa/swrast/s_logic.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_masking.c b/mesalib/src/mesa/swrast/s_masking.c index d9d06b45b..c3aa41891 100644 --- a/mesalib/src/mesa/swrast/s_masking.c +++ b/mesalib/src/mesa/swrast/s_masking.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_masking.h b/mesalib/src/mesa/swrast/s_masking.h index 0aa0755d1..03d7ad9b5 100644 --- a/mesalib/src/mesa/swrast/s_masking.h +++ b/mesalib/src/mesa/swrast/s_masking.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_points.c b/mesalib/src/mesa/swrast/s_points.c index 7483a7716..b9bec237e 100644 --- a/mesalib/src/mesa/swrast/s_points.c +++ b/mesalib/src/mesa/swrast/s_points.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_points.h b/mesalib/src/mesa/swrast/s_points.h index e356f063b..22052577d 100644 --- a/mesalib/src/mesa/swrast/s_points.h +++ b/mesalib/src/mesa/swrast/s_points.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_renderbuffer.c b/mesalib/src/mesa/swrast/s_renderbuffer.c index 54b645e78..e3f33de7d 100644 --- a/mesalib/src/mesa/swrast/s_renderbuffer.c +++ b/mesalib/src/mesa/swrast/s_renderbuffer.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_renderbuffer.h b/mesalib/src/mesa/swrast/s_renderbuffer.h index 45c57fffd..2595d7c17 100644 --- a/mesalib/src/mesa/swrast/s_renderbuffer.h +++ b/mesalib/src/mesa/swrast/s_renderbuffer.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c index cb755f9eb..10aa33c6f 100644 --- a/mesalib/src/mesa/swrast/s_span.c +++ b/mesalib/src/mesa/swrast/s_span.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/swrast/s_span.h b/mesalib/src/mesa/swrast/s_span.h index 0a5a6dc6c..794f6717f 100644 --- a/mesalib/src/mesa/swrast/s_span.h +++ b/mesalib/src/mesa/swrast/s_span.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/swrast/s_stencil.c b/mesalib/src/mesa/swrast/s_stencil.c index a63a773cf..3eeeb24b2 100644 --- a/mesalib/src/mesa/swrast/s_stencil.c +++ b/mesalib/src/mesa/swrast/s_stencil.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_stencil.h b/mesalib/src/mesa/swrast/s_stencil.h index c92f0af3e..369e7c31c 100644 --- a/mesalib/src/mesa/swrast/s_stencil.h +++ b/mesalib/src/mesa/swrast/s_stencil.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index df3a74a06..7e07f4f8a 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/src/mesa/swrast/s_texcombine.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.5 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/swrast/s_texcombine.h b/mesalib/src/mesa/swrast/s_texcombine.h index dd9151de2..e253837bc 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.h +++ b/mesalib/src/mesa/swrast/s_texcombine.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c index f6c269d8b..0196aede1 100644 --- a/mesalib/src/mesa/swrast/s_texfetch.c +++ b/mesalib/src/mesa/swrast/s_texfetch.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2009 VMware, Inc. @@ -1241,9 +1240,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_XBGR16161616_UNORM, - NULL, - NULL, - NULL + fetch_texel_1d_xbgr16161616_unorm, + fetch_texel_2d_xbgr16161616_unorm, + fetch_texel_3d_xbgr16161616_unorm }, { MESA_FORMAT_XBGR16161616_SNORM, @@ -1253,9 +1252,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_XBGR16161616_FLOAT, - NULL, - NULL, - NULL + fetch_texel_1d_xbgr16161616_float, + fetch_texel_2d_xbgr16161616_float, + fetch_texel_3d_xbgr16161616_float }, { MESA_FORMAT_XBGR16161616_UINT, @@ -1271,9 +1270,9 @@ texfetch_funcs[] = }, { MESA_FORMAT_XBGR32323232_FLOAT, - NULL, - NULL, - NULL + fetch_texel_1d_xbgr32323232_float, + fetch_texel_2d_xbgr32323232_float, + fetch_texel_3d_xbgr32323232_float }, { MESA_FORMAT_XBGR32323232_UINT, diff --git a/mesalib/src/mesa/swrast/s_texfetch.h b/mesalib/src/mesa/swrast/s_texfetch.h index dd37b066c..2a9fbb7ac 100644 --- a/mesalib/src/mesa/swrast/s_texfetch.h +++ b/mesalib/src/mesa/swrast/s_texfetch.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2009 VMware, Inc. diff --git a/mesalib/src/mesa/swrast/s_texfetch_tmp.h b/mesalib/src/mesa/swrast/s_texfetch_tmp.h index 44fa8170b..7a687532d 100644 --- a/mesalib/src/mesa/swrast/s_texfetch_tmp.h +++ b/mesalib/src/mesa/swrast/s_texfetch_tmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.7 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (c) 2008-2009 VMware, Inc. @@ -1431,6 +1430,43 @@ FETCH(rgba_16)(const struct swrast_texture_image *texImage, +/* MESA_FORMAT_XBGR.... **********************************************/ + +static void +FETCH(xbgr16161616_unorm)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) +{ + const GLushort *s = TEXEL_ADDR(GLushort, texImage, i, j, k, 4); + texel[RCOMP] = USHORT_TO_FLOAT(s[0]); + texel[GCOMP] = USHORT_TO_FLOAT(s[1]); + texel[BCOMP] = USHORT_TO_FLOAT(s[2]); + texel[ACOMP] = 1.0f; +} + +static void +FETCH(xbgr16161616_float)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) +{ + const GLhalfARB *s = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4); + texel[RCOMP] = _mesa_half_to_float(s[0]); + texel[GCOMP] = _mesa_half_to_float(s[1]); + texel[BCOMP] = _mesa_half_to_float(s[2]); + texel[ACOMP] = 1.0f; +} + +static void +FETCH(xbgr32323232_float)(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) +{ + const GLfloat *s = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4); + texel[RCOMP] = s[0]; + texel[GCOMP] = s[1]; + texel[BCOMP] = s[2]; + texel[ACOMP] = 1.0f; +} + +/* XXX other XBGR formats need to be implemented here */ + /* MESA_FORMAT_YCBCR *********************************************************/ diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c index fba8e6cba..0920a640c 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.c +++ b/mesalib/src/mesa/swrast/s_texfilter.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_texfilter.h b/mesalib/src/mesa/swrast/s_texfilter.h index 7bfa045a7..1aa7f0914 100644 --- a/mesalib/src/mesa/swrast/s_texfilter.h +++ b/mesalib/src/mesa/swrast/s_texfilter.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_triangle.c b/mesalib/src/mesa/swrast/s_triangle.c index ffe99832b..085021b58 100644 --- a/mesalib/src/mesa/swrast/s_triangle.c +++ b/mesalib/src/mesa/swrast/s_triangle.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_triangle.h b/mesalib/src/mesa/swrast/s_triangle.h index c0cbb3927..c34b6d203 100644 --- a/mesalib/src/mesa/swrast/s_triangle.h +++ b/mesalib/src/mesa/swrast/s_triangle.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_tritemp.h b/mesalib/src/mesa/swrast/s_tritemp.h index f96ddd45b..8a278dff6 100644 --- a/mesalib/src/mesa/swrast/s_tritemp.h +++ b/mesalib/src/mesa/swrast/s_tritemp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_zoom.c b/mesalib/src/mesa/swrast/s_zoom.c index 01276f4e9..352c61ad2 100644 --- a/mesalib/src/mesa/swrast/s_zoom.c +++ b/mesalib/src/mesa/swrast/s_zoom.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/s_zoom.h b/mesalib/src/mesa/swrast/s_zoom.h index a1441e81e..ae2f444bd 100644 --- a/mesalib/src/mesa/swrast/s_zoom.h +++ b/mesalib/src/mesa/swrast/s_zoom.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast/swrast.h b/mesalib/src/mesa/swrast/swrast.h index 359a985fd..3a3e451b6 100644 --- a/mesalib/src/mesa/swrast/swrast.h +++ b/mesalib/src/mesa/swrast/swrast.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_context.c b/mesalib/src/mesa/swrast_setup/ss_context.c index 0c40683a5..6ef1a5791 100644 --- a/mesalib/src/mesa/swrast_setup/ss_context.c +++ b/mesalib/src/mesa/swrast_setup/ss_context.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_context.h b/mesalib/src/mesa/swrast_setup/ss_context.h index 29de33232..d171df28c 100644 --- a/mesalib/src/mesa/swrast_setup/ss_context.h +++ b/mesalib/src/mesa/swrast_setup/ss_context.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.c b/mesalib/src/mesa/swrast_setup/ss_triangle.c index c8378fc8b..d49beb7df 100644 --- a/mesalib/src/mesa/swrast_setup/ss_triangle.c +++ b/mesalib/src/mesa/swrast_setup/ss_triangle.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_triangle.h b/mesalib/src/mesa/swrast_setup/ss_triangle.h index 2fcc6d4dc..4db72d65a 100644 --- a/mesalib/src/mesa/swrast_setup/ss_triangle.h +++ b/mesalib/src/mesa/swrast_setup/ss_triangle.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_tritmp.h b/mesalib/src/mesa/swrast_setup/ss_tritmp.h index a44fb24f2..fe1f93a39 100644 --- a/mesalib/src/mesa/swrast_setup/ss_tritmp.h +++ b/mesalib/src/mesa/swrast_setup/ss_tritmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/ss_vb.h b/mesalib/src/mesa/swrast_setup/ss_vb.h index 72c077b92..912e865cb 100644 --- a/mesalib/src/mesa/swrast_setup/ss_vb.h +++ b/mesalib/src/mesa/swrast_setup/ss_vb.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/swrast_setup/swrast_setup.h b/mesalib/src/mesa/swrast_setup/swrast_setup.h index e453e56ae..03664f390 100644 --- a/mesalib/src/mesa/swrast_setup/swrast_setup.h +++ b/mesalib/src/mesa/swrast_setup/swrast_setup.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_context.c b/mesalib/src/mesa/tnl/t_context.c index 77f1c1bce..087775941 100644 --- a/mesalib/src/mesa/tnl/t_context.c +++ b/mesalib/src/mesa/tnl/t_context.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_context.h b/mesalib/src/mesa/tnl/t_context.h index 4ebc31261..e89a7f836 100644 --- a/mesalib/src/mesa/tnl/t_context.h +++ b/mesalib/src/mesa/tnl/t_context.h @@ -1,6 +1,5 @@ /* * mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_draw.c b/mesalib/src/mesa/tnl/t_draw.c index 08cd1d1ea..637ac6f9c 100644 --- a/mesalib/src/mesa/tnl/t_draw.c +++ b/mesalib/src/mesa/tnl/t_draw.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_pipeline.c b/mesalib/src/mesa/tnl/t_pipeline.c index 7f09af7f1..bfb1b6ecd 100644 --- a/mesalib/src/mesa/tnl/t_pipeline.c +++ b/mesalib/src/mesa/tnl/t_pipeline.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_pipeline.h b/mesalib/src/mesa/tnl/t_pipeline.h index 35cd0afe3..a5d232e46 100644 --- a/mesalib/src/mesa/tnl/t_pipeline.h +++ b/mesalib/src/mesa/tnl/t_pipeline.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.3 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_rasterpos.c b/mesalib/src/mesa/tnl/t_rasterpos.c index 269a7162e..3ee5c4547 100644 --- a/mesalib/src/mesa/tnl/t_rasterpos.c +++ b/mesalib/src/mesa/tnl/t_rasterpos.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_cliptmp.h b/mesalib/src/mesa/tnl/t_vb_cliptmp.h index 4dc3320c6..c3259aa44 100644 --- a/mesalib/src/mesa/tnl/t_vb_cliptmp.h +++ b/mesalib/src/mesa/tnl/t_vb_cliptmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_fog.c b/mesalib/src/mesa/tnl/t_vb_fog.c index c011ae785..17deaaa31 100644 --- a/mesalib/src/mesa/tnl/t_vb_fog.c +++ b/mesalib/src/mesa/tnl/t_vb_fog.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_light.c b/mesalib/src/mesa/tnl/t_vb_light.c index 133894853..ee80f1b82 100644 --- a/mesalib/src/mesa/tnl/t_vb_light.c +++ b/mesalib/src/mesa/tnl/t_vb_light.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_lighttmp.h b/mesalib/src/mesa/tnl/t_vb_lighttmp.h index 5679640c9..0af2a9851 100644 --- a/mesalib/src/mesa/tnl/t_vb_lighttmp.h +++ b/mesalib/src/mesa/tnl/t_vb_lighttmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_normals.c b/mesalib/src/mesa/tnl/t_vb_normals.c index 519c90d8e..b62368cc7 100644 --- a/mesalib/src/mesa/tnl/t_vb_normals.c +++ b/mesalib/src/mesa/tnl/t_vb_normals.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_points.c b/mesalib/src/mesa/tnl/t_vb_points.c index 932194d75..5f6c25857 100644 --- a/mesalib/src/mesa/tnl/t_vb_points.c +++ b/mesalib/src/mesa/tnl/t_vb_points.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.0 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c index 5ade54343..e43d5d9eb 100644 --- a/mesalib/src/mesa/tnl/t_vb_program.c +++ b/mesalib/src/mesa/tnl/t_vb_program.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.6 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 2009 VMware, Inc. All Rights Reserved. diff --git a/mesalib/src/mesa/tnl/t_vb_render.c b/mesalib/src/mesa/tnl/t_vb_render.c index 4d42bcd3e..528f8b561 100644 --- a/mesalib/src/mesa/tnl/t_vb_render.c +++ b/mesalib/src/mesa/tnl/t_vb_render.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_rendertmp.h b/mesalib/src/mesa/tnl/t_vb_rendertmp.h index 1c6470cea..a3c9dea41 100644 --- a/mesalib/src/mesa/tnl/t_vb_rendertmp.h +++ b/mesalib/src/mesa/tnl/t_vb_rendertmp.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_texgen.c b/mesalib/src/mesa/tnl/t_vb_texgen.c index 881710858..592f9afa2 100644 --- a/mesalib/src/mesa/tnl/t_vb_texgen.c +++ b/mesalib/src/mesa/tnl/t_vb_texgen.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_texmat.c b/mesalib/src/mesa/tnl/t_vb_texmat.c index f3e317b33..c3f6a2690 100644 --- a/mesalib/src/mesa/tnl/t_vb_texmat.c +++ b/mesalib/src/mesa/tnl/t_vb_texmat.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vb_vertex.c b/mesalib/src/mesa/tnl/t_vb_vertex.c index 4cb8c06b2..7c57f17cc 100644 --- a/mesalib/src/mesa/tnl/t_vb_vertex.c +++ b/mesalib/src/mesa/tnl/t_vb_vertex.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vp_build.c b/mesalib/src/mesa/tnl/t_vp_build.c index 70492a435..241632862 100644 --- a/mesalib/src/mesa/tnl/t_vp_build.c +++ b/mesalib/src/mesa/tnl/t_vp_build.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 2007 Tungsten Graphics All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/t_vp_build.h b/mesalib/src/mesa/tnl/t_vp_build.h index e9f6de5a9..05a60f5a1 100644 --- a/mesalib/src/mesa/tnl/t_vp_build.h +++ b/mesalib/src/mesa/tnl/t_vp_build.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 2005 Tungsten Graphics All Rights Reserved. * diff --git a/mesalib/src/mesa/tnl/tnl.h b/mesalib/src/mesa/tnl/tnl.h index d67a3a71d..162b7abd7 100644 --- a/mesalib/src/mesa/tnl/tnl.h +++ b/mesalib/src/mesa/tnl/tnl.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.1 * * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h index 08c67d67d..c4472e9c2 100644 --- a/mesalib/src/mesa/vbo/vbo.h +++ b/mesalib/src/mesa/vbo/vbo.h @@ -1,6 +1,5 @@ /* * mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_context.c b/mesalib/src/mesa/vbo/vbo_context.c index 4c3c9c090..b97313dfb 100644 --- a/mesalib/src/mesa/vbo/vbo_context.c +++ b/mesalib/src/mesa/vbo/vbo_context.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_context.h b/mesalib/src/mesa/vbo/vbo_context.h index ced742033..27fae83a5 100644 --- a/mesalib/src/mesa/vbo/vbo_context.h +++ b/mesalib/src/mesa/vbo/vbo_context.h @@ -1,6 +1,5 @@ /* * mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_exec.c b/mesalib/src/mesa/vbo/vbo_exec.c index c56a14212..9c20bdef2 100644 --- a/mesalib/src/mesa/vbo/vbo_exec.c +++ b/mesalib/src/mesa/vbo/vbo_exec.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_exec_draw.c b/mesalib/src/mesa/vbo/vbo_exec_draw.c index 6a4f2a98b..1075bd5d4 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_draw.c +++ b/mesalib/src/mesa/vbo/vbo_exec_draw.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_exec_eval.c b/mesalib/src/mesa/vbo/vbo_exec_eval.c index 103b04a01..71155ce77 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_eval.c +++ b/mesalib/src/mesa/vbo/vbo_exec_eval.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.1 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_rebase.c b/mesalib/src/mesa/vbo/vbo_rebase.c index 65ab58bf3..e8258727b 100644 --- a/mesalib/src/mesa/vbo/vbo_rebase.c +++ b/mesalib/src/mesa/vbo/vbo_rebase.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_save.c b/mesalib/src/mesa/vbo/vbo_save.c index 305256a3a..08dd252cc 100644 --- a/mesalib/src/mesa/vbo/vbo_save.c +++ b/mesalib/src/mesa/vbo/vbo_save.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_save_draw.c b/mesalib/src/mesa/vbo/vbo_save_draw.c index a6ce379e2..b4c917630 100644 --- a/mesalib/src/mesa/vbo/vbo_save_draw.c +++ b/mesalib/src/mesa/vbo/vbo_save_draw.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 7.2 * * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_split.c b/mesalib/src/mesa/vbo/vbo_split.c index e128f5bd0..7cc6fbb37 100644 --- a/mesalib/src/mesa/vbo/vbo_split.c +++ b/mesalib/src/mesa/vbo/vbo_split.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_split.h b/mesalib/src/mesa/vbo/vbo_split.h index a4e5fa0b8..16276ecc3 100644 --- a/mesalib/src/mesa/vbo/vbo_split.h +++ b/mesalib/src/mesa/vbo/vbo_split.h @@ -1,6 +1,5 @@ /* * mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_split_copy.c b/mesalib/src/mesa/vbo/vbo_split_copy.c index 9df36df78..2175c8ac7 100644 --- a/mesalib/src/mesa/vbo/vbo_split_copy.c +++ b/mesalib/src/mesa/vbo/vbo_split_copy.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/vbo/vbo_split_inplace.c b/mesalib/src/mesa/vbo/vbo_split_inplace.c index b26b00af8..d04429707 100644 --- a/mesalib/src/mesa/vbo/vbo_split_inplace.c +++ b/mesalib/src/mesa/vbo/vbo_split_inplace.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 6.5 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow.c b/mesalib/src/mesa/x86/3dnow.c index f12dc2610..4e3003b43 100644 --- a/mesalib/src/mesa/x86/3dnow.c +++ b/mesalib/src/mesa/x86/3dnow.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.0.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow.h b/mesalib/src/mesa/x86/3dnow.h index e13f400d4..f61858f61 100644 --- a/mesalib/src/mesa/x86/3dnow.h +++ b/mesalib/src/mesa/x86/3dnow.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow_normal.S b/mesalib/src/mesa/x86/3dnow_normal.S index b3908f07a..ca95f2548 100644 --- a/mesalib/src/mesa/x86/3dnow_normal.S +++ b/mesalib/src/mesa/x86/3dnow_normal.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow_xform1.S b/mesalib/src/mesa/x86/3dnow_xform1.S index 004a734e1..939cd2098 100644 --- a/mesalib/src/mesa/x86/3dnow_xform1.S +++ b/mesalib/src/mesa/x86/3dnow_xform1.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow_xform2.S b/mesalib/src/mesa/x86/3dnow_xform2.S index 333ad6342..169a47f08 100644 --- a/mesalib/src/mesa/x86/3dnow_xform2.S +++ b/mesalib/src/mesa/x86/3dnow_xform2.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow_xform3.S b/mesalib/src/mesa/x86/3dnow_xform3.S index 740e07723..7b0189c4f 100644 --- a/mesalib/src/mesa/x86/3dnow_xform3.S +++ b/mesalib/src/mesa/x86/3dnow_xform3.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/3dnow_xform4.S b/mesalib/src/mesa/x86/3dnow_xform4.S index 4612d368f..ee845b340 100644 --- a/mesalib/src/mesa/x86/3dnow_xform4.S +++ b/mesalib/src/mesa/x86/3dnow_xform4.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/clip_args.h b/mesalib/src/mesa/x86/clip_args.h index bafa535ef..92e7b596e 100644 --- a/mesalib/src/mesa/x86/clip_args.h +++ b/mesalib/src/mesa/x86/clip_args.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/common_x86.c b/mesalib/src/mesa/x86/common_x86.c index 910828f16..3c1adc916 100644 --- a/mesalib/src/mesa/x86/common_x86.c +++ b/mesalib/src/mesa/x86/common_x86.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/common_x86_asm.S b/mesalib/src/mesa/x86/common_x86_asm.S index 230d588c4..1887bcaaf 100644 --- a/mesalib/src/mesa/x86/common_x86_asm.S +++ b/mesalib/src/mesa/x86/common_x86_asm.S @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.3 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/common_x86_asm.h b/mesalib/src/mesa/x86/common_x86_asm.h index a4b714396..dae3ca2a6 100644 --- a/mesalib/src/mesa/x86/common_x86_asm.h +++ b/mesalib/src/mesa/x86/common_x86_asm.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/common_x86_features.h b/mesalib/src/mesa/x86/common_x86_features.h index 2069b906e..862548440 100644 --- a/mesalib/src/mesa/x86/common_x86_features.h +++ b/mesalib/src/mesa/x86/common_x86_features.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 5.1 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/gen_matypes.c b/mesalib/src/mesa/x86/gen_matypes.c index fff6f541b..80ee61aa8 100644 --- a/mesalib/src/mesa/x86/gen_matypes.c +++ b/mesalib/src/mesa/x86/gen_matypes.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/mmx.h b/mesalib/src/mesa/x86/mmx.h index 0772e0f6f..8101cf889 100644 --- a/mesalib/src/mesa/x86/mmx.h +++ b/mesalib/src/mesa/x86/mmx.h @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.5.2 * * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/norm_args.h b/mesalib/src/mesa/x86/norm_args.h index 34a546a8b..a85c711f8 100644 --- a/mesalib/src/mesa/x86/norm_args.h +++ b/mesalib/src/mesa/x86/norm_args.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse.c b/mesalib/src/mesa/x86/sse.c index f3e93248b..846184fa3 100644 --- a/mesalib/src/mesa/x86/sse.c +++ b/mesalib/src/mesa/x86/sse.c @@ -1,6 +1,5 @@ /* * Mesa 3-D graphics library - * Version: 6.0 * * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse.h b/mesalib/src/mesa/x86/sse.h index 20a4de277..72b45531d 100644 --- a/mesalib/src/mesa/x86/sse.h +++ b/mesalib/src/mesa/x86/sse.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse_normal.S b/mesalib/src/mesa/x86/sse_normal.S index 7024dd0ce..36d69e0b0 100644 --- a/mesalib/src/mesa/x86/sse_normal.S +++ b/mesalib/src/mesa/x86/sse_normal.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse_xform1.S b/mesalib/src/mesa/x86/sse_xform1.S index d165aff6d..7d84a52bc 100644 --- a/mesalib/src/mesa/x86/sse_xform1.S +++ b/mesalib/src/mesa/x86/sse_xform1.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse_xform2.S b/mesalib/src/mesa/x86/sse_xform2.S index bb0f75696..70215100d 100644 --- a/mesalib/src/mesa/x86/sse_xform2.S +++ b/mesalib/src/mesa/x86/sse_xform2.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse_xform3.S b/mesalib/src/mesa/x86/sse_xform3.S index 60c011094..aeb43ef70 100644 --- a/mesalib/src/mesa/x86/sse_xform3.S +++ b/mesalib/src/mesa/x86/sse_xform3.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/sse_xform4.S b/mesalib/src/mesa/x86/sse_xform4.S index 596efd06a..0baa8ef84 100644 --- a/mesalib/src/mesa/x86/sse_xform4.S +++ b/mesalib/src/mesa/x86/sse_xform4.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_cliptest.S b/mesalib/src/mesa/x86/x86_cliptest.S index b8163dad9..031ec1d88 100644 --- a/mesalib/src/mesa/x86/x86_cliptest.S +++ b/mesalib/src/mesa/x86/x86_cliptest.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_xform.c b/mesalib/src/mesa/x86/x86_xform.c index 8d1488e8b..007cd704d 100644 --- a/mesalib/src/mesa/x86/x86_xform.c +++ b/mesalib/src/mesa/x86/x86_xform.c @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_xform.h b/mesalib/src/mesa/x86/x86_xform.h index 9052fa46a..12b9fb8ff 100644 --- a/mesalib/src/mesa/x86/x86_xform.h +++ b/mesalib/src/mesa/x86/x86_xform.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_xform2.S b/mesalib/src/mesa/x86/x86_xform2.S index b66146041..a36c3dcda 100644 --- a/mesalib/src/mesa/x86/x86_xform2.S +++ b/mesalib/src/mesa/x86/x86_xform2.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_xform3.S b/mesalib/src/mesa/x86/x86_xform3.S index 017914095..52783064e 100644 --- a/mesalib/src/mesa/x86/x86_xform3.S +++ b/mesalib/src/mesa/x86/x86_xform3.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/x86_xform4.S b/mesalib/src/mesa/x86/x86_xform4.S index e9e9b7154..e585968ed 100644 --- a/mesalib/src/mesa/x86/x86_xform4.S +++ b/mesalib/src/mesa/x86/x86_xform4.S @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mesalib/src/mesa/x86/xform_args.h b/mesalib/src/mesa/x86/xform_args.h index d2cf6f712..b20d6a109 100644 --- a/mesalib/src/mesa/x86/xform_args.h +++ b/mesalib/src/mesa/x86/xform_args.h @@ -1,7 +1,6 @@ /* * Mesa 3-D graphics library - * Version: 3.5 * * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. * diff --git a/mkfontscale/ident.c b/mkfontscale/ident.c index 41212575e..22d364830 100644 --- a/mkfontscale/ident.c +++ b/mkfontscale/ident.c @@ -47,7 +47,9 @@ and 0 if it should be processed normally. identifyBitmap is much faster than parsing the whole font. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <stdlib.h> #include <string.h> diff --git a/pixman/configure.ac b/pixman/configure.ac index 221179ff1..5b9512ca5 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -616,7 +616,7 @@ AC_ARG_ENABLE(arm-iwmmxt2, if test "x$IWMMXT_CFLAGS" = "x" ; then IWMMXT_CFLAGS="-flax-vector-conversions -Winline -march=iwmmxt" if test $enable_iwmmxt2 != no ; then - IWMMXT_CFLAGS+="2" + IWMMXT_CFLAGS="${IWMMXT_CFLAGS}2" fi fi @@ -778,7 +778,7 @@ PKG_PROG_PKG_CONFIG if test $enable_gtk = yes ; then AC_CHECK_LIB([pixman-1], [pixman_version_string]) - PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1]) + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1]) fi if test $enable_gtk = auto ; then @@ -786,7 +786,7 @@ if test $enable_gtk = auto ; then fi if test $enable_gtk = auto ; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1], [enable_gtk=yes], [enable_gtk=no]) + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1], [enable_gtk=yes], [enable_gtk=no]) fi AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes]) diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt index ac3635c9b..e42b40808 100644 --- a/xorg-server/xkeyboard-config/symbols/pt +++ b/xorg-server/xkeyboard-config/symbols/pt @@ -7,7 +7,7 @@ xkb_symbols "basic" { name[Group1]="Portuguese"; - key <LSGT> { [ less, greater ] }; + key <LSGT> { [ less, greater, backslash, backslash ] }; key <AE03> { [ 3, numbersign, sterling, sterling ] }; key <AE04> { [ 4, dollar, section, dollar ] }; key <AE11> { [apostrophe, question, backslash, questiondown ] }; |