[OpenSmalltalk/opensmalltalk-vm] 275eca: Revert "The B3D plugin is now working again on Mac...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[OpenSmalltalk/opensmalltalk-vm] 275eca: Revert "The B3D plugin is now working again on Mac...

Eliot Miranda-3
 
  Branch: refs/heads/Cog
  Home:   https://github.com/OpenSmalltalk/opensmalltalk-vm
  Commit: 275eca83761d0a9aa3e689a7f0c33465c6f160e1
      https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/275eca83761d0a9aa3e689a7f0c33465c6f160e1
  Author: Fabio Niephaus <[hidden email]>
  Date:   2018-01-29 (Mon, 29 Jan 2018)

  Changed paths:
    M platforms/iOS/plugins/B3DAcceleratorPlugin/Makefile
    A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.c
    M platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.h
    R platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGL.m
    A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacOpenGLInfo.c
    A platforms/iOS/plugins/B3DAcceleratorPlugin/sqMacUIConstants.h
    R platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.c
    R platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGL.h
    R platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacOpenGLInfo.c
    R platforms/iOS/plugins/B3DAcceleratorPlugin/zzz/sqMacUIConstants.h
    M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.h
    M platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m

  Log Message:
  -----------
  Revert "The B3D plugin is now working again on Mac OS X."

This reverts commit bc6e34d1b2998cb8f3b38a2ce0818eda35a25ce9 and fixes #178.

The vm segfaulted on Travis (#178) because this commit introduced the use of shader and assumed that shader compilation always works (see [1]). As a matter of fact, it does fail on Travis and maybe other macOS systems.

@ronsaldo please provide an updated PR to address the above.

[1] https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/bc6e34d1b2998cb8f3b38a2ce0818eda35a25ce9?diff=unified#diff-7c007173fcbc79b3e9984468210d3d11R369