Mesa (master): i915g: Fix comment.

2012-02-12 Thread Stephane Marchesin
Module: Mesa
Branch: master
Commit: 175adf0776d8df066a908b06055f243bd1325a34
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=175adf0776d8df066a908b06055f243bd1325a34

Author: Stéphane Marchesin 
Date:   Sun Jan 22 23:44:31 2012 -0800

i915g: Fix comment.

---

 src/gallium/drivers/i915/i915_fpc_translate.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c 
b/src/gallium/drivers/i915/i915_fpc_translate.c
index a82ad14..1adbbe5 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -528,7 +528,7 @@ i915_translate_instruction(struct i915_fp_compile *p,
   i915_emit_arith(p, A0_MOD, tmp, A0_DEST_CHANNEL_X, 0, tmp, 0, 0);
 
   /* 
-   * t0.xy = MUL x.xx11, x.x  ; x^2, x, 1, 1
+   * t0.xy = MUL x.xx11, x.x111  ; x^2, x, 1, 1
* t0 = MUL t0.xyxy t0.xx11 ; x^4, x^3, x^2, 1
* t0 = MUL t0.xxz1 t0.z111; x^6 x^4 x^2 1
* result = DP4 t0, cos_constants

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


Mesa (master): i915g: Fix comment.

2011-10-08 Thread Stephane Marchesin
Module: Mesa
Branch: master
Commit: 03cd54dc6044264ee7bf03541e37d9c3e18a834d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=03cd54dc6044264ee7bf03541e37d9c3e18a834d

Author: Stéphane Marchesin 
Date:   Sat Oct  8 23:57:27 2011 -0700

i915g: Fix comment.

---

 src/gallium/drivers/i915/i915_state.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state.c 
b/src/gallium/drivers/i915/i915_state.c
index f6e5310..a233a04 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -361,7 +361,7 @@ static void i915_delete_sampler_state(struct pipe_context 
*pipe,
 
 
 /**
- * Called during state validation when LP_NEW_SAMPLER_VIEW is set.
+ * Called before drawing VBO to map vertex samplers and hand them to draw
  */
 void
 i915_prepare_vertex_sampling(struct i915_context *i915,

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


Mesa (master): i915g: Fix comment.

2011-10-05 Thread Stephane Marchesin
Module: Mesa
Branch: master
Commit: 527235223abd8b64908b0c21311567e6c7d9920d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=527235223abd8b64908b0c21311567e6c7d9920d

Author: Stéphane Marchesin 
Date:   Sat Sep 24 12:56:22 2011 -0700

i915g: Fix comment.

---

 src/gallium/drivers/i915/i915_fpc_translate.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c 
b/src/gallium/drivers/i915/i915_fpc_translate.c
index b383a74..8877215 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -373,7 +373,7 @@ translate_tex_src_target(struct i915_fp_compile *p, uint 
tex)
 }
 
 /**
- * Convert TGSI_TEXTURE_x token to DO_SAMPLE_TYPE_x token
+ * Return the number of coords needed to access a given TGSI_TEXTURE_*
  */
 static uint
 texture_num_coords(struct i915_fp_compile *p, uint tex)

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


Mesa (master): i915g: Fix comment about sin/cos constants.

2011-06-28 Thread Stephane Marchesin
Module: Mesa
Branch: master
Commit: fe36bc0c41ee7fd3aa7b364a8301d50613644f71
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe36bc0c41ee7fd3aa7b364a8301d50613644f71

Author: Stéphane Marchesin 
Date:   Tue Jun 28 12:07:11 2011 -0700

i915g: Fix comment about sin/cos constants.

---

 src/gallium/drivers/i915/i915_fpc_translate.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c 
b/src/gallium/drivers/i915/i915_fpc_translate.c
index 41c94e6..cae349e 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -85,14 +85,14 @@ static const float scs_cos_constants[4] = { 1.0,
-1.0f / (6 * 5 * 4 * 3 * 2 * 1)
 };
 
-/* 1, -1/3!, 1/5!, -1/7! */
+/* 2*pi, -(2*pi)^3/3!, (2*pi)^5/5!, -(2*pi)^7/7! */
 static const float sin_constants[4] = { 2.0 * M_PI,
-8.0f * M_PI * M_PI * M_PI / (3 * 2 * 1),
32.0f * M_PI * M_PI * M_PI * M_PI * M_PI / (5 * 4 * 3 * 2 * 1),
-128.0f * M_PI * M_PI * M_PI * M_PI * M_PI * M_PI * M_PI / (7 * 6 * 5 * 4 * 
3 * 2 * 1)
 };
 
-/* 1, -1/2!, 1/4!, -1/6! */
+/* 1, -(2*pi)^2/2!, (2*pi)^4/4!, -(2*pi)^6/6! */
 static const float cos_constants[4] = { 1.0,
-4.0f * M_PI * M_PI / (2 * 1),
16.0f * M_PI * M_PI * M_PI * M_PI / (4 * 3 * 2 * 1),

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


Mesa (master): i915g: Fix comment.

2011-06-22 Thread Stephane Marchesin
Module: Mesa
Branch: master
Commit: 468c2c08414f0ad07e2c2c2a98506f6390124963
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=468c2c08414f0ad07e2c2c2a98506f6390124963

Author: Stéphane Marchesin 
Date:   Wed Jun 22 16:47:36 2011 -0700

i915g: Fix comment.

Reported-by: Marcin Baczynski 

---

 src/gallium/drivers/i915/i915_fpc_translate.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c 
b/src/gallium/drivers/i915/i915_fpc_translate.c
index 27f1008..738d331 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -907,7 +907,7 @@ i915_translate_instruction(struct i915_fp_compile *p,
   break;
 
case TGSI_OPCODE_SNE:
-  /* if we're neither < nor > then we're != */
+  /* if we're < or > then we're != */
   src0 = src_vector(p, &inst->Src[0], fs);
   src1 = src_vector(p, &inst->Src[1], fs);
   tmp = i915_get_utemp(p);

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


Mesa (master): i915g: Fix comment in is buffer referenced

2009-11-07 Thread Jakob Bornecrantz
Module: Mesa
Branch: master
Commit: 57d77c6a4474beecdd22b97a8f5af6e4d2833d97
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=57d77c6a4474beecdd22b97a8f5af6e4d2833d97

Author: Jakob Bornecrantz 
Date:   Sat Nov  7 19:31:18 2009 +

i915g: Fix comment in is buffer referenced

---

 src/gallium/drivers/i915/i915_context.c |   10 +++---
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_context.c 
b/src/gallium/drivers/i915/i915_context.c
index e745f33..94c8aee 100644
--- a/src/gallium/drivers/i915/i915_context.c
+++ b/src/gallium/drivers/i915/i915_context.c
@@ -155,15 +155,11 @@ static unsigned int
 i915_is_buffer_referenced(struct pipe_context *pipe,
   struct pipe_buffer *buf)
 {
-   /**
-* FIXME: Return the corrent result. We can't alays return referenced
-*since it causes a double flush within the vbo module.
+   /*
+* Since we never expose hardware buffers to the state tracker
+* they can never be referenced, so this isn't a lie
 */
-#if 0
-   return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-#else
return 0;
-#endif
 }
 
 

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