Re: [Mesa-dev] [Intel-gfx] [PATCH 1/2] drm/i915/kbl: Remove unused Kabylake pci ids

2017-09-12 Thread Paulo Zanoni 
Em Seg, 2017-09-11 às 10:10 -0700, Rodrigo Vivi escreveu:
> On Mon, Sep 11, 2017 at 04:11:33PM +, Anuj Phogat wrote:
> > See Mesa commits: ebc5ccf and b2dae9f
> 
> I believe we need to be in sync between multiple gfx stack
> components,
> but I  don't believe we should remove ids.
> 
> In the past we had cases where we noticed a product group using a
> listed
> id to do a product and we just noticed the id after a user reported
> at fd.o.

On the other hand, don't we have the risk that someone is going to see
that these IDs are unused for KBL and them repurpose them om some
future non-KBL product?

> 
> For us in kernel the cycle until that id gets into a stable release
> propagated to OSVs distros can be a bit long.
> 
> Also Xserver ids are nowadays in sync with Mesa ones and I believe
> some
> OSVs might take a while to upgrade the Xserver as well in case of a
> new
> found product with some "new" id.
> 
> For this reason I was always in favor of adding all possible reserved
> ids from the
> beginning.
> 
> And this approach worked well on BDW and SKL, where we've seeing
> later some
> reserved ids becoming real product and we didn't have to do any extra
> step.
> 
> For this same reason I believe the right solution is to
> add those ids back to mesa instead of removing from kernel and
> libdrm.
> 
> Thanks,
> Rodrigo.
> 
> > 
> > Cc: Matt Turner 
> > Cc: Rodrigo Vivi 
> > Signed-off-by: Anuj Phogat 
> > ---
> >  drivers/gpu/drm/i915/i915_pci.c |  1 -
> >  include/drm/i915_pciids.h   | 15 ++-
> >  2 files changed, 2 insertions(+), 14 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c
> > b/drivers/gpu/drm/i915/i915_pci.c
> > index 129877b..ecf6d4c 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -613,7 +613,6 @@ static const struct pci_device_id pciidlist[] =
> > {
> >     INTEL_KBL_GT1_IDS(_kabylake_gt1_info),
> >     INTEL_KBL_GT2_IDS(_kabylake_gt2_info),
> >     INTEL_KBL_GT3_IDS(_kabylake_gt3_info),
> > -   INTEL_KBL_GT4_IDS(_kabylake_gt3_info),
> >     INTEL_CFL_S_GT1_IDS(_coffeelake_gt1_info),
> >     INTEL_CFL_S_GT2_IDS(_coffeelake_gt2_info),
> >     INTEL_CFL_H_GT2_IDS(_coffeelake_gt2_info),
> > diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> > index 1257e15..a1bf90e 100644
> > --- a/include/drm/i915_pciids.h
> > +++ b/include/drm/i915_pciids.h
> > @@ -337,15 +337,10 @@
> >     INTEL_VGA_DEVICE(0x3185, info)
> >  
> >  #define INTEL_KBL_GT1_IDS(info)\
> > -   INTEL_VGA_DEVICE(0x5913, info), /* ULT GT1.5 */ \
> > -   INTEL_VGA_DEVICE(0x5915, info), /* ULX GT1.5 */ \
> >     INTEL_VGA_DEVICE(0x5917, info), /* DT  GT1.5 */ \
> >     INTEL_VGA_DEVICE(0x5906, info), /* ULT GT1 */ \
> > -   INTEL_VGA_DEVICE(0x590E, info), /* ULX GT1 */ \
> >     INTEL_VGA_DEVICE(0x5902, info), /* DT  GT1 */ \
> > -   INTEL_VGA_DEVICE(0x5908, info), /* Halo GT1 */ \
> > -   INTEL_VGA_DEVICE(0x590B, info), /* Halo GT1 */ \
> > -   INTEL_VGA_DEVICE(0x590A, info) /* SRV GT1 */
> > +   INTEL_VGA_DEVICE(0x590B, info)  /* Halo GT1 */
> >  
> >  #define INTEL_KBL_GT2_IDS(info)\
> >     INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
> > @@ -353,22 +348,16 @@
> >     INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
> >     INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
> >     INTEL_VGA_DEVICE(0x591B, info), /* Halo GT2 */ \
> > -   INTEL_VGA_DEVICE(0x591A, info), /* SRV GT2 */ \
> >     INTEL_VGA_DEVICE(0x591D, info) /* WKS GT2 */
> >  
> >  #define INTEL_KBL_GT3_IDS(info) \
> > -   INTEL_VGA_DEVICE(0x5923, info), /* ULT GT3 */ \
> >     INTEL_VGA_DEVICE(0x5926, info), /* ULT GT3 */ \
> >     INTEL_VGA_DEVICE(0x5927, info) /* ULT GT3 */
> >  
> > -#define INTEL_KBL_GT4_IDS(info) \
> > -   INTEL_VGA_DEVICE(0x593B, info) /* Halo GT4 */
> > -
> >  #define INTEL_KBL_IDS(info) \
> >     INTEL_KBL_GT1_IDS(info), \
> >     INTEL_KBL_GT2_IDS(info), \
> > -   INTEL_KBL_GT3_IDS(info), \
> > -   INTEL_KBL_GT4_IDS(info)
> > +   INTEL_KBL_GT3_IDS(info)
> >  
> >  /* CFL S */
> >  #define INTEL_CFL_S_GT1_IDS(info) \
> > -- 
> > 2.9.4
> > 
> > ___
> > Intel-gfx mailing list
> > intel-...@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> ___
> Intel-gfx mailing list
> intel-...@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 00/27] Renderbuffer Decompression (and GBM modifiers)

2016-12-06 Thread Paulo Zanoni 
t Render
Decompression is in use and start doing the things it should do?

Thanks,
Paulo


> 1. All of the patches up through 26 should be mergeable today after review.
> 2. After 1-12 land, client support of Y-tiling should be achievable. 
> Modesetting
> driver can probably be updated as can things like Weston. Clients assuming a 
> new
> enough kernel should be able to blindly set the y tiled modifier.
> 3. Once kernel and libdrm support for CCS modifiers, patch 27 can land, 
> however
> CCS isn't yet usable, it is only available as a prototype.
> 4. Kristian's GET_PLANE2 interface needs to be solidified and land.
> 5. Clients will utilize #3 and #4 to use CCS.
> 6. Protocol work, EGL, Wayland, DRIX - etc
>
> When Kristian's interface is ready, kmscube can be modified to make use of it.
>
> Rob: are you interested in a PR for kmscube?
>
> Definition of terms:
> Renderbuffer Decompression - In the ARM world, this is AFBC. Having the 
> graphics
> driver utilize lossless surface compression for the scanout buffer and sending
> those surfaces, compressed, to the kernel (via KMS) for the display engine to
> directly consume.
>
> Renderbuffer Compression - Utilizing compressed surfaces for many buffer types
> (scanout, textures, whatever), and decompressing (ie. resolving) those 
> surfaces
> before passing them along.
>
> Ben Widawsky (27):
>   gbm: Move getters to match order in header file (trivial)
>   gbm: Fix width height getters return type (trivial)
>   gbm: Export a plane getter function
>   gbm: Create a gbm_device getter for stride
>   gbm: Export a per plane getter for stride
>   gbm: Export a per plane getter for offset
>   i965/dri: Store the screen associated with the image
>   dri: Add an image creation with modifiers
>   gbm: Introduce modifiers into surface/bo creation
>   i965: Handle Y-tile modifier
>   gbm: Get modifiers from DRI
>   i965: Bring back always Y-tiled on SKL+
>   i965: Separate image allocation with modifiers
>   i965: Allow aux buffers to have an offset
>   i965/miptree: Add a helper functions for image creation
>   i965/miptree: Allocate mcs_buf for an image's CCS_E
>   i965: Create correctly sized mcs for an image
>   i965/miptree: Add a return for updating of winsys
>   i965/miptree: Allocate mt earlier in update winsys
>   i965: Pretend that CCS modified images are two planes
>   i965: Make CCS stride match kernel's expectations
>   i965: Change resolve flags to enum
>   i965: Plumb resolve hints from miptrees to blorp
>   i965: Add new resolve hints full and partial
>   i965: Use partial resolves for CCS buffers being scanned out
>   i965: Remove scanout restriction from lossless compression
>   i965: Handle compression modifier
>
>  include/GL/internal/dri_interface.h  |  28 ++-
>  src/egl/drivers/dri2/platform_drm.c  |   7 +-
>  src/gallium/state_trackers/dri/dri2.c|   1 +
>  src/gbm/backends/dri/gbm_dri.c   | 132 ++-
>  src/gbm/gbm-symbols-check|   6 +
>  src/gbm/main/gbm.c   | 112 ++--
>  src/gbm/main/gbm.h   |  28 ++-
>  src/gbm/main/gbmint.h|  16 +-
>  src/mesa/drivers/dri/i965/brw_blorp.c|  12 +-
>  src/mesa/drivers/dri/i965/brw_blorp.h|   3 +-
>  src/mesa/drivers/dri/i965/brw_context.c  |  53 --
>  src/mesa/drivers/dri/i965/brw_wm_surface_state.c |   3 +-
>  src/mesa/drivers/dri/i965/intel_fbo.c|  17 +-
>  src/mesa/drivers/dri/i965/intel_image.h  |   5 +
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.c| 139 +++
>  src/mesa/drivers/dri/i965/intel_mipmap_tree.h|  29 +++-
>  src/mesa/drivers/dri/i965/intel_screen.c | 207 
> +--
>  src/mesa/drivers/dri/i965/intel_tex_image.c  |  17 +-
>  18 files changed, 688 insertions(+), 127 deletions(-)
>
> Cc: Kristian H. Kristensen <hoegsb...@gmail.com>
> Cc: Daniel Stone <dani...@collabora.com>
> Cc: Rob Clark <robdcl...@gmail.com>
>
> --
> 2.10.2
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev



-- 
Paulo Zanoni
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH mesa] i965: add more Haswell PCI IDs

2012-08-07 Thread Paulo Zanoni 
2012/8/6 Kenneth Graunke kenn...@whitecape.org:
 On 08/06/2012 02:50 PM, Paulo Zanoni wrote:
 From: Paulo Zanoni paulo.r.zan...@intel.com

 Signed-off-by: Paulo Zanoni paulo.r.zan...@intel.com

 Reviewed-by: Kenneth Graunke kenn...@whitecape.org

 Do you have push access?  If not, I can commit this for you.

I just discovered I have. Patch committed, thanks.


-- 
Paulo Zanoni
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa] i965: add more Haswell PCI IDs

2012-08-06 Thread Paulo Zanoni 
From: Paulo Zanoni paulo.r.zan...@intel.com

Signed-off-by: Paulo Zanoni paulo.r.zan...@intel.com
---
 include/pci_ids/i965_pci_ids.h | 33 ++-
 src/mesa/drivers/dri/intel/intel_chipset.h | 67 --
 src/mesa/drivers/dri/intel/intel_context.c | 35 +++-
 3 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/include/pci_ids/i965_pci_ids.h b/include/pci_ids/i965_pci_ids.h
index e38f8d2..09dca5b 100644
--- a/include/pci_ids/i965_pci_ids.h
+++ b/include/pci_ids/i965_pci_ids.h
@@ -28,6 +28,37 @@ CHIPSET(0x015a, IVYBRIDGE_S_GT1, ivb_gt1)
 CHIPSET(0x016a, IVYBRIDGE_S_GT2, ivb_gt2)
 CHIPSET(0x0402, HASWELL_GT1, hsw_gt1)
 CHIPSET(0x0412, HASWELL_GT2, hsw_gt2)
+CHIPSET(0x0422, HASWELL_GT2_PLUS, hsw_gt2)
 CHIPSET(0x0406, HASWELL_M_GT1, hsw_gt1)
 CHIPSET(0x0416, HASWELL_M_GT2, hsw_gt2)
-CHIPSET(0x0A16, HASWELL_M_ULT_GT2, hsw_gt2)
+CHIPSET(0x0426, HASWELL_M_GT2_PLUS, hsw_gt2)
+CHIPSET(0x040A, HASWELL_S_GT1, hsw_gt1)
+CHIPSET(0x041A, HASWELL_S_GT2, hsw_gt2)
+CHIPSET(0x042A, HASWELL_S_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0C02, HASWELL_SDV_GT1, hsw_gt1)
+CHIPSET(0x0C12, HASWELL_SDV_GT2, hsw_gt2)
+CHIPSET(0x0C22, HASWELL_SDV_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0C06, HASWELL_SDV_M_GT1, hsw_gt1)
+CHIPSET(0x0C16, HASWELL_SDV_M_GT2, hsw_gt2)
+CHIPSET(0x0C26, HASWELL_SDV_M_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0C0A, HASWELL_SDV_S_GT1, hsw_gt1)
+CHIPSET(0x0C1A, HASWELL_SDV_S_GT2, hsw_gt2)
+CHIPSET(0x0C2A, HASWELL_SDV_S_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0A02, HASWELL_ULT_GT1, hsw_gt1)
+CHIPSET(0x0A12, HASWELL_ULT_GT2, hsw_gt2)
+CHIPSET(0x0A22, HASWELL_ULT_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0A06, HASWELL_ULT_M_GT1, hsw_gt1)
+CHIPSET(0x0A16, HASWELL_ULT_M_GT2, hsw_gt2)
+CHIPSET(0x0A26, HASWELL_ULT_M_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0A0A, HASWELL_ULT_S_GT1, hsw_gt1)
+CHIPSET(0x0A1A, HASWELL_ULT_S_GT2, hsw_gt2)
+CHIPSET(0x0A2A, HASWELL_ULT_S_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0D12, HASWELL_CRW_GT1, hsw_gt1)
+CHIPSET(0x0D22, HASWELL_CRW_GT2, hsw_gt2)
+CHIPSET(0x0D32, HASWELL_CRW_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0D16, HASWELL_CRW_M_GT1, hsw_gt1)
+CHIPSET(0x0D26, HASWELL_CRW_M_GT2, hsw_gt2)
+CHIPSET(0x0D36, HASWELL_CRW_M_GT2_PLUS, hsw_gt2)
+CHIPSET(0x0D1A, HASWELL_CRW_S_GT1, hsw_gt1)
+CHIPSET(0x0D2A, HASWELL_CRW_S_GT2, hsw_gt2)
+CHIPSET(0x0D3A, HASWELL_CRW_S_GT2_PLUS, hsw_gt2)
diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h 
b/src/mesa/drivers/dri/intel/intel_chipset.h
index c1d904e..9c00ba8 100644
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -89,9 +89,40 @@
 
 #define PCI_CHIP_HASWELL_GT10x0402 /* Desktop */
 #define PCI_CHIP_HASWELL_GT20x0412
+#define PCI_CHIP_HASWELL_GT2_PLUS   0x0422
 #define PCI_CHIP_HASWELL_M_GT1  0x0406 /* Mobile */
 #define PCI_CHIP_HASWELL_M_GT2  0x0416
-#define PCI_CHIP_HASWELL_M_ULT_GT2  0x0A16 /* Mobile ULT */
+#define PCI_CHIP_HASWELL_M_GT2_PLUS 0x0426
+#define PCI_CHIP_HASWELL_S_GT1  0x040A /* Server */
+#define PCI_CHIP_HASWELL_S_GT2  0x041A
+#define PCI_CHIP_HASWELL_S_GT2_PLUS 0x042A
+#define PCI_CHIP_HASWELL_SDV_GT10x0C02 /* Desktop */
+#define PCI_CHIP_HASWELL_SDV_GT20x0C12
+#define PCI_CHIP_HASWELL_SDV_GT2_PLUS   0x0C22
+#define PCI_CHIP_HASWELL_SDV_M_GT1  0x0C06 /* Mobile */
+#define PCI_CHIP_HASWELL_SDV_M_GT2  0x0C16
+#define PCI_CHIP_HASWELL_SDV_M_GT2_PLUS 0x0C26
+#define PCI_CHIP_HASWELL_SDV_S_GT1  0x0C0A /* Server */
+#define PCI_CHIP_HASWELL_SDV_S_GT2  0x0C1A
+#define PCI_CHIP_HASWELL_SDV_S_GT2_PLUS 0x0C2A
+#define PCI_CHIP_HASWELL_ULT_GT10x0A02 /* Desktop */
+#define PCI_CHIP_HASWELL_ULT_GT20x0A12
+#define PCI_CHIP_HASWELL_ULT_GT2_PLUS   0x0A22
+#define PCI_CHIP_HASWELL_ULT_M_GT1  0x0A06 /* Mobile */
+#define PCI_CHIP_HASWELL_ULT_M_GT2  0x0A16
+#define PCI_CHIP_HASWELL_ULT_M_GT2_PLUS 0x0A26
+#define PCI_CHIP_HASWELL_ULT_S_GT1  0x0A0A /* Server */
+#define PCI_CHIP_HASWELL_ULT_S_GT2  0x0A1A
+#define PCI_CHIP_HASWELL_ULT_S_GT2_PLUS 0x0A2A
+#define PCI_CHIP_HASWELL_CRW_GT10x0D12 /* Desktop */
+#define PCI_CHIP_HASWELL_CRW_GT20x0D22
+#define PCI_CHIP_HASWELL_CRW_GT2_PLUS   0x0D32
+#define PCI_CHIP_HASWELL_CRW_M_GT1  0x0D16 /* Mobile */
+#define PCI_CHIP_HASWELL_CRW_M_GT2  0x0D26
+#define PCI_CHIP_HASWELL_CRW_M_GT2_PLUS 0x0D36
+#define PCI_CHIP_HASWELL_CRW_S_GT1  0x0D1A /* Server */
+#define PCI_CHIP_HASWELL_CRW_S_GT2  0x0D2A
+#define PCI_CHIP_HASWELL_CRW_S_GT2_PLUS 0x0D3A
 
 #define IS_MOBILE(devid)   (devid == PCI_CHIP_I855_GM || \
 devid == PCI_CHIP_I915_GM || \
@@ -163,10 +194,40 @@
 IS_HASWELL(devid))
 
 #define IS_HSW_GT1(devid)  (devid == PCI_CHIP_HASWELL_GT1 || \
-devid == PCI_CHIP_HASWELL_M_GT1)
+devid == PCI_CHIP_HASWELL_M_GT1 || \
+devid == PCI_CHIP_HASWELL_S_GT1

Re: [Mesa-dev] [RFC mesa-demos] Add --with-system-data-files configure option

2011-01-31 Thread Paulo Zanoni 
2011/1/29 Henri Verbeet hverb...@gmail.com:
 If you pass -M to format-patch, it becomes a lot smaller.


Thanks for the tip. For some reason I had to use -M -C --find-copies-harder.
Attached is the same patch, but with these options.


-- 
Paulo Zanoni
From df235322ecbe969ce70dcf516111686ff1d59ee0 Mon Sep 17 00:00:00 2001
From: Paulo Zanoni pzan...@mandriva.com
Date: Fri, 28 Jan 2011 17:34:24 -0200
Subject: [PATCH] Add --with-system-data-files option

If you specify --with-system-data-files, binaries will try to find .dat and
image files inside ${datadir}/${PACKAGE}. If you don't specify, they will try to
find the files inside ../data (keeping backwards compatibility).

Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---
 .gitignore  |5 +++
 CMakeLists.txt  |2 +
 Makefile.am |3 +-
 configure.ac|   18 -
 index.html  |2 +-
 m4/ac_define_dir.m4 |   49 +++
 src/CMakeLists.txt  |2 +-
 src/Makefile.am |2 +-
 src/{images = data}/CMakeLists.txt |2 +-
 src/{images = data}/Makefile.am|9 +-
 src/{images = data}/arch.rgb   |  Bin 793398 - 793398 bytes
 src/{images = data}/bw.rgb |  Bin 206452 - 206452 bytes
 src/{demos = data}/geartrain.dat   |0
 src/{images = data}/girl.rgb   |  Bin 117075 - 117075 bytes
 src/{images = data}/girl2.rgb  |  Bin 117139 - 117139 bytes
 src/{demos = data}/isosurf.dat |0
 src/{images = data}/reflect.rgb|  Bin 39632 - 39632 bytes
 src/{images = data}/s128.rgb   |  Bin 54258 - 54258 bytes
 src/{demos = data}/terrain.dat |0
 src/{images = data}/tile.rgb   |  Bin 206534 - 206534 bytes
 src/{images = data}/tree2.rgba |  Bin 66048 - 66048 bytes
 src/{images = data}/tree3.rgb  |  Bin 24816 - 24816 bytes
 src/{images = data}/wrs_logo.rgb   |  Bin 37574 - 37574 bytes
 src/demos/CMakeLists.txt|4 ---
 src/demos/Makefile.am   |5 +---
 src/demos/copypix.c |2 +-
 src/demos/dissolve.c|4 +-
 src/demos/drawpix.c |2 +-
 src/demos/engine.c  |2 +-
 src/demos/fbo_firecube.c|7 +++--
 src/demos/fire.c|7 +++--
 src/demos/geartrain.c   |2 +-
 src/demos/gloss.c   |4 +-
 src/demos/ipers.c   |2 +-
 src/demos/isosurf.c |4 +-
 src/demos/lodbias.c |2 +-
 src/demos/multiarb.c|4 +-
 src/demos/projtex.c |8 +++---
 src/demos/rain.cxx  |3 +-
 src/demos/readpix.c |2 +-
 src/demos/reflect.c |2 +-
 src/demos/teapot.c  |4 +-
 src/demos/terrain.c |2 +-
 src/demos/texcyl.c  |2 +-
 src/demos/textures.c|8 +++---
 src/demos/tunnel.c  |4 +-
 src/demos/tunnel2.c |4 +-
 src/demos/winpos.c  |2 +-
 src/fp/fp-tri.c |2 +-
 src/fp/tri-tex.c|2 +-
 src/fpglsl/fp-tri.c |2 +-
 src/glsl/bump.c |2 +-
 src/glsl/convolutions.c |2 +-
 src/glsl/multitex.c |4 +-
 src/glsl/texdemo1.c |2 +-
 src/perf/glslstateschange.c |8 +++---
 src/samples/sphere.c|2 +-
 src/tests/afsmultiarb.c |4 +-
 src/tests/arbfptexture.c|2 +-
 src/tests/arbfptrig.c   |2 +-
 src/tests/arbnpot.c |2 +-
 src/tests/arraytexture.c|   16 +-
 src/tests/blendxor.c|2 +-
 src/tests/bug_3195.c|2 +-
 src/tests/bumpmap.c |2 +-
 src/tests/ext422square.c|2 +-
 src/tests/fillrate.c|4 +-
 src/tests/floattex.c|2 +-
 src/tests/fptexture.c   |2 +-
 src/tests/invert.c  |2 +-
 src/tests/mipmap_limits.c   |2 +-
 src/tests/mipmap_view.c |2 +-
 src/tests/multipal.c|4 +-
 src/tests/pbo.c |2 +-
 src/tests/rubberband.c  |2 +-
 src/tests/texcmp.c  |2 +-
 src/tests/texcompress2.c|2 +-
 src/tests/texline.c |2 +-
 src/tests/texrect.c |4 +-
 src/tests/vparray.c |2 +-
 src/tests/yuvrect.c |2 +-
 src/tests/yuvsquare.c   |2 +-
 src/xdemos/yuvrect_client.c |2 +-
 83 files changed, 180 insertions(+), 106 deletions(-)
 create mode 100644 m4/ac_define_dir.m4
 rename src/{images = data

[Mesa-dev] [RFC mesa-demos] Add --with-system-data-files configure option

2011-01-28 Thread Paulo Zanoni 
Hello

One of the problems with mesa-demos is that the demos have hardcoded paths to
data files (example: fopen(../images/something.rgb, ...)). Distributions
shipping the package need to sed all those paths in order to ship working
demos. This patch introduces a DEMOS_DATA_DIR definition that should be used
when trying to open a data file. After this patch, distros packaging mesa-demos
only need to specify --with-system-data-files when building and the apps will
automatically look for the file in the right place. If you're a developer that
doesn't use make install, everything will still work as always: just
don't use the new option, the patch is backwards-compatible.

I have to admit that my autotools-fu is bad, so if you know any better way to
implement this feature, please tell me: I'll be happy to learn and implement.
IMHO, the ugliest part is the addition of the ac_define_dir m4 macro (stolen
from the xserver tree, btw).

For the CMake system, I only added a definition to keep backward-compatibility.
Suggestions are welcome here too.

Another detail is that image files were moved from src/images to src/data
(since data/ contais not only image files, but .dat files too).

As a last note, I didn't do anything to .vert, .geom and .frag files. Maybe they
should be handled the same way? Some of these files are mentioned in .shtest
files, and I didn't have time to investigate how these files work (maybe the
only way would be using .in files?).

As a consequence of moving images/ to data/, the patch file is 3.9MB
long, so you can grab it here:
http://www.inf.ufpr.br/paulo/0002-Add-with-system-data-files-option.patch

Any comments, improvements or objections?

Cheers,
Paulo


-- 
Paulo Zanoni
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa-demos] cmake: fix egl/opengl compilation (needs -lm)

2011-01-28 Thread Paulo Zanoni 

Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---

My cmake-fu is not good. Maybe there are better ways to fix this. Suggestions
are always welcome =D

 src/egl/opengl/CMakeLists.txt |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/opengl/CMakeLists.txt b/src/egl/opengl/CMakeLists.txt
index ede9ec3..3a012e1 100644
--- a/src/egl/opengl/CMakeLists.txt
+++ b/src/egl/opengl/CMakeLists.txt
@@ -6,10 +6,10 @@ add_executable(eglinfo eglinfo.c)
 target_link_libraries(eglinfo ${EGL_egl_LIBRARY})
 
 add_executable(eglgears_screen eglgears.c)
-target_link_libraries(eglgears_screen ${EGL_egl_LIBRARY} eglut_screen)
+target_link_libraries(eglgears_screen ${EGL_egl_LIBRARY} eglut_screen m)
 
 if(X11_FOUND)
   add_executable(eglgears_x11 eglgears.c)
-  target_link_libraries(eglgears_x11 ${EGL_egl_LIBRARY} eglut_x11)
+  target_link_libraries(eglgears_x11 ${EGL_egl_LIBRARY} eglut_x11 m)
 endif(X11_FOUND)
 
-- 
1.7.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] dri_util: fail driCreateNewScreen if InitScreen is NULL

2011-01-13 Thread Paulo Zanoni 
I forgot to mention: this will give us a working X server with
_software_ rendering, instead of a segfaulting X.

2011/1/13 Paulo Zanoni pzan...@mandriva.com:
 Without this, X doesn't start with UMS on r300g.

 Signed-off-by: Paulo Zanoni pzan...@mandriva.com
 ---

 Sending patch as discussed in #radeon
 Tested with mesa 7.10. If the patch is accepted, please backport to 7.10.

  src/mesa/drivers/dri/common/dri_util.c |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)

 diff --git a/src/mesa/drivers/dri/common/dri_util.c 
 b/src/mesa/drivers/dri/common/dri_util.c
 index a5b71bd..bf8cf6e 100644
 --- a/src/mesa/drivers/dri/common/dri_util.c
 +++ b/src/mesa/drivers/dri/common/dri_util.c
 @@ -790,6 +790,9 @@ driCreateNewScreen(int scrn,
     static const __DRIextension *emptyExtensionList[] = { NULL };
     __DRIscreen *psp;

 +    if (driDriverAPI.InitScreen == NULL)
 +       return NULL;
 +
     psp = calloc(1, sizeof *psp);
     if (!psp)
        return NULL;
 --
 1.7.1

 ___
 mesa-dev mailing list
 mesa-dev@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/mesa-dev




-- 
Paulo Zanoni
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa-demos 1/6] es1_info: convert indentString into a literal string

2011-01-06 Thread Paulo Zanoni 
This fixes compilation with -Wformat -Werror=format-security. Some
distros like Mandriva enable this flag by default. Its purpose is to
improve security.

Another option for this patch would be to do
printf(%s, indentString), but converting indentString into a literal
also gives the compiler some hints to improve performance.

Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---

By the way, combining this patch with a printf(%s, indentString) would
make the code even safer. The last patch of this series does this change, so
you can choose to apply it or not.

Using printf(string); is dangerous, might lead to bugs and even
security issues. If the string being printed contains the % character
one can do really dangerous things. Even if you think the string in
question might not be dangerous, future code changes might lead that
piece of code to bugs or security holes.

Some references:
http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments
http://wiki.debian.org/Hardening#DEBBUILDHARDENINGFORMAT.28gcc.2BAC8-g.2B-.2B--Wformat-Wformat-security.29
http://en.wikipedia.org/wiki/Format_string_attack

See also How To Write Shared Libraries Section 2.4.1, written by Ulrich
Drepper for more information on the difference between 'char *foo = bar'
and 'char foo[] = bar'


 src/egl/opengles1/es1_info.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/egl/opengles1/es1_info.c b/src/egl/opengles1/es1_info.c
index 93816b5..38becc5 100644
--- a/src/egl/opengles1/es1_info.c
+++ b/src/egl/opengles1/es1_info.c
@@ -29,7 +29,7 @@
 static void
 print_extension_list(const char *ext)
 {
-   const char *indentString = ;
+   const char indentString[] = ;
const int indent = 4;
const int max = 79;
int width, i, j;
-- 
1.7.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa-demos 2/6] Add missing binaries to .gitignore

2011-01-06 Thread Paulo Zanoni 
Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---
 src/demos/.gitignore |1 +
 src/egl/opengles1/.gitignore |1 +
 src/glsl/.gitignore  |1 +
 src/gs/.gitignore|1 +
 src/tests/.gitignore |1 +
 src/trivial/.gitignore   |4 
 6 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 src/gs/.gitignore

diff --git a/src/demos/.gitignore b/src/demos/.gitignore
index bf71667..807033d 100644
--- a/src/demos/.gitignore
+++ b/src/demos/.gitignore
@@ -32,6 +32,7 @@ lodbias
 morph3d
 multiarb
 paltex
+pixeltest
 pointblast
 projtex
 rain
diff --git a/src/egl/opengles1/.gitignore b/src/egl/opengles1/.gitignore
index 135e3de..3263ff2 100644
--- a/src/egl/opengles1/.gitignore
+++ b/src/egl/opengles1/.gitignore
@@ -1,4 +1,5 @@
 bindtex
+clear
 drawtex_x11
 drawtex_screen
 es1_info
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
index 2b7f84f..44c6249 100644
--- a/src/glsl/.gitignore
+++ b/src/glsl/.gitignore
@@ -1,4 +1,5 @@
 array
+bezier
 bitmap
 brick
 bump
diff --git a/src/gs/.gitignore b/src/gs/.gitignore
new file mode 100644
index 000..5df2e95
--- /dev/null
+++ b/src/gs/.gitignore
@@ -0,0 +1 @@
+gs-tri
diff --git a/src/tests/.gitignore b/src/tests/.gitignore
index cb3b5fe..b6d112e 100644
--- a/src/tests/.gitignore
+++ b/src/tests/.gitignore
@@ -59,6 +59,7 @@ mipgen
 mipmap_comp
 mipmap_comp_tests
 mipmap_limits
+mipmap_tunnel
 mipmap_view
 multipal
 multitexarray
diff --git a/src/trivial/.gitignore b/src/trivial/.gitignore
index 1787f27..b14de32 100644
--- a/src/trivial/.gitignore
+++ b/src/trivial/.gitignore
@@ -1,4 +1,5 @@
 clear
+clear-color
 clear-fbo
 clear-fbo-scissor
 clear-fbo-tex
@@ -34,6 +35,7 @@ line-userclip-clip
 line-userclip-nop
 line-userclip-nop-clip
 line-wide
+line-xor
 lineloop
 lineloop-clip
 lineloop-elts
@@ -96,6 +98,7 @@ tri-cull
 tri-cull-both
 tri-dlist
 tri-edgeflag
+tri-edgeflag-array
 tri-fbo
 tri-fbo-tex
 tri-fbo-tex-mip
@@ -119,6 +122,7 @@ tri-square
 tri-stencil
 tri-stipple
 tri-tex
+tri-tex-1d
 tri-tex-3d
 tri-tri
 tri-unfilled
-- 
1.7.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa-demos 3/6] opengles2/tri.c: remove trailing white spaces

2011-01-06 Thread Paulo Zanoni 
So git won't complain when you apply the next patch.
Also, code looks prettier this way.

Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---
 src/egl/opengles2/tri.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/opengles2/tri.c b/src/egl/opengles2/tri.c
index 8981d8a..df2751b 100644
--- a/src/egl/opengles2/tri.c
+++ b/src/egl/opengles2/tri.c
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  *
@@ -416,7 +416,7 @@ usage(void)
printf(  -display displayname  set the display to run on\n);
printf(  -info   display OpenGL renderer info\n);
 }
- 
+
 
 int
 main(int argc, char *argv[])
-- 
1.7.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH mesa-demos 6/6] es1_info: change printf(indentString) to printf(%s, indentString)

2011-01-06 Thread Paulo Zanoni 
IMHO, code looks safer this way.

Signed-off-by: Paulo Zanoni pzan...@mandriva.com
---

Please read comments from patch 0001.

 src/egl/opengles1/es1_info.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/egl/opengles1/es1_info.c b/src/egl/opengles1/es1_info.c
index 38becc5..e33597f 100644
--- a/src/egl/opengles1/es1_info.c
+++ b/src/egl/opengles1/es1_info.c
@@ -38,7 +38,7 @@ print_extension_list(const char *ext)
   return;
 
width = indent;
-   printf(indentString);
+   printf(%s, indentString);
i = j = 0;
while (1) {
   if (ext[j] == ' ' || ext[j] == 0) {
@@ -48,7 +48,7 @@ print_extension_list(const char *ext)
 /* start a new line */
 printf(\n);
 width = indent;
-printf(indentString);
+printf(%s, indentString);
  }
  /* print the extension name between ext[i] and ext[j] */
  while (i  j) {
-- 
1.7.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev