Re: [Mesa3d-dev] [PATCH 0/12] OpenGL ES try2
On Fri, Oct 30, 2009 at 12:44:35PM +0800, Chia-I Wu wrote: > It has been a month and several weeks since my last try. Comparing to > the last try, the number of patches goes down from 34 to 12. Most of > them have gone into the master. Due to the size, the patch series is > uploaded elsewhere > http://0xlab.org/~olv/mesa-es-try2/ or > http://0xlab.org/~olv/mesa-es-try2.tar.gz I screwed up while merging/rebasing the patches. Please use http://0xlab.org/~olv/mesa-es-try2-v2/ or http://0xlab.org/~olv/mesa-es-try2-v2.tar.gz Sorry for the inconvenience. -- Regards, olv -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] [PATCH 0/12] OpenGL ES try2
Hi, It has been a month and several weeks since my last try. Comparing to the last try, the number of patches goes down from 34 to 12. Most of them have gone into the master. Due to the size, the patch series is uploaded elsewhere http://0xlab.org/~olv/mesa-es-try2/ or http://0xlab.org/~olv/mesa-es-try2.tar.gz It is also browseable from http://www.gitorious.org/android-eeepc/mesa/commits/mesa-es The patch series starts with smaller changes to mesa core and glapi. They add some opengl es bits to mesa core, and more importantly, change the glapi so that different sets of generated headers/sources can be used. Despite the changes, the compiled objects should be exact the same as before, except that several symbols are made global. There is no regression expected. By changing the generated headers (and others) to use, it is possible to build * libmesa.a, libmesagallium.a and libglapi.a for OpenGL * libes1.a, libes1gallium.a and libes1api.a for OpenGL ES 1.x * libes2.a, libes2gallium.a and libes2api.a for OpenGL ES 2.x at the same time. They are parallel, and analogous. The ES variants of the headers/sources are generated from a new set of glapi XMLs for OpenGL ES. I do not pre-generate them, which makes python a dependency of OpenGL ES overlay at build time. This is mainly to keep the patch series pure. It can always be changed. The resulting libraries can be used just like how libmesa*.a and libglapi.a are used. Patch 11 uses them to create the final libGLESv1_CM.so and libGLESv2.so. They can be built through $ make -C src/mesa/es/ $ make -C src/gallium/state_trackers/es/ They are tested to work with the demos from opengl-es branch, which are included as the last patch. There are some known issues not revealed by the demos though. For example, GL_TEXTURE_GEN_STR_OES is not supported. I prefer to fix them after this series. -- Regards, olv -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] add X8Z24 <> MESA_S8Z24 conversion
okias wrote: > Sorry, that patch was probably not correct, here is fixed patch. Committed. Thanks. -Brian -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] add X8R8G8B8 <> XRGB8888 conversion
okias wrote: > Fix nouveau glxinfo after merging texformat-rework. Committed. Thanks. -Brian -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] add X8Z24 <> MESA_S8Z24 conversion
Looks good. Committed. Thanks! -Brian -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] add X8R8G8B8 <> XRGB8888 conversion
Fix nouveau glxinfo after merging texformat-rework.
This patch add forgot XRGB <> X8R8G8B8 conversion.
Signed-off-by: David Heidelberger
---
--- a/src/mesa/state_tracker/st_format.c2009-10-29 15:39:21.778200092
+0100
+++ b/src/mesa/state_tracker/st_format.c2009-10-29 15:33:08.150963668
+0100
@@ -218,6 +218,8 @@
case MESA_FORMAT_ARGB_REV:
case MESA_FORMAT_ARGB:
return PIPE_FORMAT_A8R8G8B8_UNORM;
+ case MESA_FORMAT_XRGB:
+ return PIPE_FORMAT_X8R8G8B8_UNORM;
case MESA_FORMAT_ARGB1555:
return PIPE_FORMAT_A1R5G5B5_UNORM;
case MESA_FORMAT_ARGB:
@@ -287,6 +289,8 @@
switch (pipeFormat) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
return MESA_FORMAT_ARGB;
+ case PIPE_FORMAT_X8R8G8B8_UNORM:
+ return MESA_FORMAT_XRGB;
case PIPE_FORMAT_A1R5G5B5_UNORM:
return MESA_FORMAT_ARGB1555;
case PIPE_FORMAT_A4R4G4B4_UNORM:
@@ -698,6 +702,8 @@
switch (format) {
case PIPE_FORMAT_A8R8G8B8_UNORM:
return MESA_FORMAT_ARGB;
+ case PIPE_FORMAT_X8R8G8B8_UNORM:
+ return MESA_FORMAT_XRGB;
case PIPE_FORMAT_A1R5G5B5_UNORM:
return MESA_FORMAT_ARGB1555;
case PIPE_FORMAT_A4R4G4B4_UNORM:
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] add X8Z24 <> MESA_S8Z24 conversion
Add conversion from PIPE_FORMAT_X8Z24_UNORM to MESA_FORMAT_S8_Z24. Fix glxgears and openarena for Nouveau (no more asserts and crash). Signed-off-by: David Heidelberger -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] texformat-rework branch
On Thu, Oct 29, 2009 at 9:49 AM, Brian Paul wrote: > Alex Deucher wrote: >> >> On Wed, Oct 28, 2009 at 11:44 PM, Brian Paul >> wrote: >>> >>> OK, the merge is done. >>> >>> Here's a quick summary of the changes: >>> >>> * The old gl_texture_format struct is replaced by a new gl_format enum. >>> * The new formats are defined in formats.h and all the helper >>> functions are in formats.c >>> * textures and renderbuffers now use the same format info/fields >>> * some special case code for compressed vs. uncompressed textures was >>> unified. >>> * new XRGB and X8Z24 formats >>> * removed swrast-only/GLchan texture formats >>> >>> I don't know of any regressions but I haven't tested all the DRI >>> drivers. If anyone finds any problems, let me know (please provide >>> details) and I'll help you ASAP. >> >> fbo_firecube spews the following: >> radeonSetSpanFunctions: bad format: 0x001C > > OK, should be fixed now. Yep, that did it. thanks! Alex -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] [PATCH 0/4] Fix compilation errors when features are disabled
Chia-I Wu wrote:
> Hi,
>
> This patch series fixes compilation errors/warnings when features are
> disabled. The errors mainly come from the missing symbols when texture
> format features like FEATURE_texture_{fxt1,s3tc,sRGB} are disabled.
>
> The first patch makes _mesa_get_texstore_func never return NULL. This
> is analogous with the what _mesa_get_texel_store_func does.
>
> The following two patches fix compilation errors when
> FEATURE_texture_{fxt1,s3tc} are disabled. The fetch/store functions are
> #define'd to be NULL when the respective features are disabled. This
> approach is more clear than having a bunch of #ifdef or no-op static
> inline functions. It is noted in the sources. If this turns out to be
> a problem, it can always be changed to use static inline functions.
>
> The last patch fixes compilation errors and warnings when some of
> features are disabled. They are all simple fixes.
Committed. Thanks.
-Brian
--
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] texformat-rework branch
Alex Deucher wrote: > On Wed, Oct 28, 2009 at 11:44 PM, Brian Paul wrote: >> OK, the merge is done. >> >> Here's a quick summary of the changes: >> >> * The old gl_texture_format struct is replaced by a new gl_format enum. >> * The new formats are defined in formats.h and all the helper >> functions are in formats.c >> * textures and renderbuffers now use the same format info/fields >> * some special case code for compressed vs. uncompressed textures was >> unified. >> * new XRGB and X8Z24 formats >> * removed swrast-only/GLchan texture formats >> >> I don't know of any regressions but I haven't tested all the DRI >> drivers. If anyone finds any problems, let me know (please provide >> details) and I'll help you ASAP. > > fbo_firecube spews the following: > radeonSetSpanFunctions: bad format: 0x001C OK, should be fixed now. -Brian -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] Gallium interfaces (include/pipe)
On Wed, 2009-10-28 at 05:21 -0700, José Fonseca wrote: > On Tue, 2009-10-27 at 14:45 -0700, Younes Manton wrote: > > I'd just like to add that if other interfaces will exist in the future > > (I recall pipe_2d_context being floated at one time) and state > > trackers want to use them without initializing a pipe_context > > needlessly and want to reuse the rest of the DRM winsys then the > > relevent parts of this patch (or comparable changes) will need to be > > considered sooner or later regardless of whether or not > > pipe_video_context exists. > > Indeed. > > And it is not only the problem of the pipe_*_context creation. There is > the problem of the state tracker still reaching out parts of the winsys. > > I really think that a simple driver with a generic interface query as I > proposed in > > http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg07818.html > > is the best, and we sorely need it, with the recent and welcomed > increase of pipe drivers and state trackers. > > I'll try to prototype this on a few state trackers and see how it goes. In the meantime though, I think we're getting to a point where there's enough riding on the interfaces in gallium/include/pipe that we want to start being a bit more rigorous about updates to that directory. We're already often using feature branches for larger changes and reviews for important patches. Let's formalize that for changes that touch the Gallium interfaces in include/pipe. Additionally, I'm going to play the maintainer card at this point and ask that changes to the include/pipe directory on the master branch go through me, after review on Mesa-dev. Development on the rest of the tree I'm OK with as it stands, but I think we need a coherent process to guide the direction of interface change and growth. For my own part, I'll make sure that my personal changes to gallium/include follow the same process as above, and are properly reviewed on the list before pushing. Keith -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
Re: [Mesa3d-dev] [PATCH] Make DRI/DRM state tracker interface less context-dependent
On Wed, 2009-10-28 at 05:21 -0700, José Fonseca wrote: > On Tue, 2009-10-27 at 14:45 -0700, Younes Manton wrote: > > I'd just like to add that if other interfaces will exist in the future > > (I recall pipe_2d_context being floated at one time) and state > > trackers want to use them without initializing a pipe_context > > needlessly and want to reuse the rest of the DRM winsys then the > > relevent parts of this patch (or comparable changes) will need to be > > considered sooner or later regardless of whether or not > > pipe_video_context exists. > > Indeed. > > And it is not only the problem of the pipe_*_context creation. There is > the problem of the state tracker still reaching out parts of the winsys. > > I really think that a simple driver with a generic interface query as I > proposed in > > http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg07818.html > > is the best, and we sorely need it, with the recent and welcomed > increase of pipe drivers and state trackers. > > I'll try to prototype this on a few state trackers and see how it goes. > > Jose It's an interesting topic how to broaden the set of interfaces that we manage in Gallium, and there's a real opportunity to create a nice solution. My personal interest would be to see Gallium grow an ability to build a complete driver (possibly at runtime) out of a set of registered components, each of which implements one or more named interfaces, and in turn depends on a set of named interfaces. Once you do that, we end up with a lot of flexibility about how to incorporate new interfaces over time, and add the ability to keep older versions alive, provide compatibility shims, and so forth. It also provides a universal mechanism for injecting tracing shims, etc. Keith -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
[Mesa3d-dev] [PATCH 0/4] Fix compilation errors when features are disabled
Hi,
This patch series fixes compilation errors/warnings when features are
disabled. The errors mainly come from the missing symbols when texture
format features like FEATURE_texture_{fxt1,s3tc,sRGB} are disabled.
The first patch makes _mesa_get_texstore_func never return NULL. This
is analogous with the what _mesa_get_texel_store_func does.
The following two patches fix compilation errors when
FEATURE_texture_{fxt1,s3tc} are disabled. The fetch/store functions are
#define'd to be NULL when the respective features are disabled. This
approach is more clear than having a bunch of #ifdef or no-op static
inline functions. It is noted in the sources. If this turns out to be
a problem, it can always be changed to use static inline functions.
The last patch fixes compilation errors and warnings when some of
features are disabled. They are all simple fixes.
--
Regards,
olv
>From 6f76409d7679a2e18583e842e62a8c2469b76f0b Mon Sep 17 00:00:00 2001
From: Chia-I Wu
Date: Thu, 29 Oct 2009 15:19:59 +0800
Subject: [PATCH 1/4] mesa/main: Never return NULL in _mesa_get_texstore_func.
Signed-off-by: Chia-I Wu
---
src/mesa/main/texstore.c | 28 +---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 36228e6..01fea47 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3083,6 +3083,26 @@ texstore_funcs[MESA_FORMAT_COUNT] =
};
+static GLboolean
+_mesa_texstore_null(TEXSTORE_PARAMS)
+{
+ (void) ctx; (void) dims;
+ (void) baseInternalFormat;
+ (void) dstFormat;
+ (void) dstAddr;
+ (void) dstXoffset; (void) dstYoffset; (void) dstZoffset;
+ (void) dstRowStride; (void) dstImageOffsets;
+ (void) srcWidth; (void) srcHeight; (void) srcDepth;
+ (void) srcFormat; (void) srcType;
+ (void) srcAddr;
+ (void) srcPacking;
+
+ /* should never happen */
+ _mesa_problem(NULL, "_mesa_texstore_null() is called");
+ return GL_FALSE;
+}
+
+
/**
* Return the StoreTexImageFunc pointer to store an image in the given format.
*/
@@ -3096,7 +3116,11 @@ _mesa_get_texstore_func(gl_format format)
}
#endif
ASSERT(texstore_funcs[format].Name == format);
- return texstore_funcs[format].Store;
+
+ if (texstore_funcs[format].Store)
+ return texstore_funcs[format].Store;
+ else
+ return _mesa_texstore_null;
}
@@ -3112,8 +3136,6 @@ _mesa_texstore(TEXSTORE_PARAMS)
storeImage = _mesa_get_texstore_func(dstFormat);
- assert(storeImage);
-
success = storeImage(ctx, dims, baseInternalFormat,
dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
dstRowStride, dstImageOffsets,
--
1.6.3.3
>From a46ff1a9e898b0737f515f4c80409dc3bbefaf3a Mon Sep 17 00:00:00 2001
From: Chia-I Wu
Date: Thu, 29 Oct 2009 14:14:04 +0800
Subject: [PATCH 2/4] mesa/main: Make FEATURE_texture_fxt1 follow feature conventions.
Also remove the unused initialization and GLchan fetch functions.
Signed-off-by: Chia-I Wu
---
src/mesa/main/context.c |3 ---
src/mesa/main/texcompress.h |3 ---
src/mesa/main/texcompress_fxt1.c | 35 ++-
src/mesa/main/texcompress_fxt1.h | 22 ++
4 files changed, 20 insertions(+), 43 deletions(-)
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c57d7c1..1d540eb 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -706,9 +706,6 @@ init_attrib_groups(GLcontext *ctx)
#if FEATURE_texture_s3tc
_mesa_init_texture_s3tc( ctx );
#endif
-#if FEATURE_texture_fxt1
- _mesa_init_texture_fxt1( ctx );
-#endif
/* Miscellaneous */
ctx->NewState = _NEW_ALL;
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 4184167..d4873db 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -48,9 +48,6 @@ _mesa_compressed_image_address(GLint col, GLint row, GLint img,
extern void
_mesa_init_texture_s3tc( GLcontext *ctx );
-extern void
-_mesa_init_texture_fxt1( GLcontext *ctx );
-
#else /* _HAVE_FULL_GL */
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index ef42fb9..85becb8 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -41,6 +41,9 @@
#include "texstore.h"
+#if FEATURE_texture_fxt1
+
+
static void
fxt1_encode (GLuint width, GLuint height, GLint comps,
const void *source, GLint srcRowStride,
@@ -52,16 +55,6 @@ fxt1_decode_1 (const void *texture, GLint stride,
/**
- * Called during context initialization.
- */
-void
-_mesa_init_texture_fxt1( GLcontext *ctx )
-{
- (void) ctx;
-}
-
-
-/**
* Store user's image in rgb_fxt1 format.
*/
GLboolean
@@ -176,15 +169,6 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
void
-_mesa_fetch_texel_2d_rgba_fxt1( const struct gl_texture_image *texImage,
-GLint i, GLint j, GLint k, GLchan *te
[Mesa3d-dev] [Bug 24766] 32-bit libGL.so searches for DRI modules in /usr/lib/dri instead of /usr/lib32/dri
http://bugs.freedesktop.org/show_bug.cgi?id=24766 Chow Loong Jin changed: What|Removed |Added Attachment #30761|0 |1 is obsolete|| --- Comment #14 from Chow Loong Jin 2009-10-29 00:12:50 PST --- Created an attachment (id=30786) --> (http://bugs.freedesktop.org/attachment.cgi?id=30786) Add --with-dri-searchpath configure flag As requested, it is --with-dri-searchpath now. -- Configure bugmail: http://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. -- Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference ___ Mesa3d-dev mailing list Mesa3d-dev@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
