Changeset 2090Tweet

Timestamp:

Nov 19, 2012, 1:45:41 AM (7 years ago)

Author:

sam

Message:

neercs: added a better check for forkpty(), and moved the GL_POINTS
size and texture logic to the vertex shader.

Location:

trunk

Files:

• configure.ac (modified) (2 diffs)
• tools/neercs/old/attach.c (modified) (1 diff)
• tools/neercs/old/effects.c (modified) (1 diff)
• tools/neercs/old/grab.c (modified) (1 diff)
• tools/neercs/term/pty.cpp (modified) (7 diffs)
• tools/neercs/video/text-render.cpp (modified) (3 diffs)
• tools/neercs/video/text-render.h (modified) (1 diff)
• tools/neercs/video/text.lolfx (modified) (3 diffs)

trunk/configure.ac

@@ -106 +106 @@
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
 AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
-AC_CHECK_LIB(util, forkpty, UTIL_LIBS="${UTIL_LIBS} -lutil")
+
+AC_CHECK_LIB(util, forkpty,
+ [UTIL_LIBS="${UTIL_LIBS} -lutil"
+  dnl  Override future forkpty detection
+  ac_cv_func_forkpty="yes"])
+AC_CHECK_FUNCS(forkpty)
 
 dnl Are we on the PS3?
@@ -357 +362 @@
 
 dnl  Can we build neercs?
-AM_CONDITIONAL(BUILD_NEERCS, test "${ac_cv_my_have_caca}" != "no" -a "${ac_cv_header_glob_h}" = "yes")
+AM_CONDITIONAL(BUILD_NEERCS, test "${ac_cv_my_have_caca}" != "no")
 
 

trunk/tools/neercs/old/attach.c

@@ -17 +17 @@
 #endif
 
-#if !defined _WIN32
+#if !defined _WIN32 && defined HAVE_GLOB_H
 
 #include <errno.h>

trunk/tools/neercs/old/effects.c

@@ -22 +22 @@
 #include <string.h>
 #include <time.h>
+#include <endian.h>
 #include <sys/wait.h>
 #include <sys/types.h>

trunk/tools/neercs/old/grab.c

@@ -15 +15 @@
 #endif
 
-#if !defined _WIN32
+#if !defined _WIN32 && defined HAVE_GLOB_H
 
 #define _XOPEN_SOURCE 500       /* getsid() */

trunk/tools/neercs/term/pty.cpp

@@ -15 +15 @@
 #endif
 
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
 #   define _XOPEN_SOURCE
 #   include <stdlib.h>
@@ -54 +54 @@
 Pty::~Pty()
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     delete[] m_unread_data;
 
@@ -66 +66 @@
 void Pty::Run(char const *command, ivec2 size)
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     int fd;
     pid_t pid;
@@ -113 +113 @@
 size_t Pty::ReadData(char *data, size_t maxlen)
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     /* Do we have data from previous call? */
     if (m_unread_len)
@@ -173 +173 @@
 void Pty::UnreadData(char *data, size_t len)
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     char *new_data;
 
@@ -194 +194 @@
 size_t Pty::WriteData(char const *data, size_t len)
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     /* FIXME: can we be more naive than that? */
     return write((int)m_fd, data, len);
@@ -204 +204 @@
 void Pty::SetWindowSize(ivec2 size, int64_t fd /* = -1 */)
 {
-#if defined HAVE_PTY_H || defined HAVE_UTIL_H || defined HAVE_LIBUTIL_H
+#if defined HAVE_FORKPTY
     if (m_size == size)
         return;

trunk/tools/neercs/video/text-render.cpp

@@ -51 +51 @@
     m_char = m_shader->GetAttribLocation("in_Char",
                                          VertexUsage::Color, 1);
-    m_texture = m_shader->GetUniformLocation("in_Texture");
-    m_transform = m_shader->GetUniformLocation("in_Transform");
+    m_texture = m_shader->GetUniformLocation("u_Texture");
+    m_transform = m_shader->GetUniformLocation("u_Transform");
+    m_pointsize = m_shader->GetUniformLocation("u_PointSize");
     m_vdecl
       = new VertexDeclaration(VertexStream<vec2>(VertexUsage::Position),
@@ -129 +130 @@
     glViewport(0, 0, m_fbo_size.x, m_fbo_size.y);
     glDisable(GL_DEPTH_TEST);
+#if !defined HAVE_GLES_2X
     glEnable(GL_POINT_SPRITE);
     //glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
     glDisable(GL_POINT_SMOOTH);
-    glPointSize((float)max(m_font_size.x, m_font_size.y));
+#endif
+    glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
+    glTexEnvi(GL_POINT_SPRITE, GL_COORD_REPLACE, GL_TRUE);
     m_shader->Bind();
     m_font->Bind();
     m_shader->SetUniform(m_texture, 0);
     m_shader->SetUniform(m_transform, xform);
+    m_shader->SetUniform(m_pointsize, (float)max(m_font_size.x, m_font_size.y));
     m_vdecl->SetStream(m_vbo1, m_coord);
     m_vdecl->SetStream(m_vbo2, m_color);
@@ -145 +150 @@
     m_font->Unbind();
     m_shader->Unbind();
+#if !defined HAVE_GLES_2X
     glDisable(GL_POINT_SPRITE);
+#endif
     m_fbo->Unbind();
 }

trunk/tools/neercs/video/text-render.h

@@ -21 +21 @@
 
     TileSet *m_font;
+
     Shader *m_shader;
     ShaderAttrib m_coord, m_color, m_char;
-    ShaderUniform m_texture, m_transform;
+    ShaderUniform m_texture, m_transform, m_pointsize;
     VertexDeclaration *m_vdecl;
     VertexBuffer *m_vbo1, *m_vbo2, *m_vbo3;
+
     FrameBuffer *m_fbo;
 };

trunk/tools/neercs/video/text.lolfx

@@ -16 +16 @@
 varying vec2 pass_UV;
 
-uniform mat4 in_Transform;
+uniform float u_PointSize;
+uniform mat4 u_Transform;
 
 void main()
@@ -57 +58 @@
 
     // This only works with glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
-    //gl_PointSize = 40;
+    gl_PointSize = u_PointSize;
 
-    gl_Position = in_Transform * vec4(in_Position, 0.0, 1.0);
+    gl_Position = u_Transform * vec4(in_Position, 0.0, 1.0);
 }
 
@@ -70 +71 @@
 varying vec2 pass_UV;
 
-uniform sampler2D in_Texture;
+uniform sampler2D u_Texture;
 
 void main(void)
 {
     vec2 c = gl_PointCoord * (1.0 / 32.0) + pass_UV;
-    float t = texture2D(in_Texture, c).x;
+    float t = texture2D(u_Texture, c).x;
     gl_FragColor = mix(pass_Background, pass_Foreground, t);
 }